more cleaning

more cleanup