Pretty massive cleanup of stuff, some is gone for good, some is coming
back later