Loads of cleanup and junk. Some things broken for now