cleanup
cleanip some more