remove un-needed code, fix comment, fix tests