Cleaning up some things, stripping junk