clean up stuff
clean up more