more cleanup
remove classes not used anymore
more cleanup