Some more cleanup on Waehlby