maint - more cleanup