clean up of some stuff
cleanup