maint - remove unnecessary code