more cleanup, simplify