more cleanup

just more cleanup