more cleanup, simplification