Clean-up on the #40 #alms