Broke a bunch of stuff during cleanup