clean up of some stuff