#215 more cleanup