Did lots of stuff
cleanup