More crap
Clean up lots of stuff