Cleanup, lots of stuff broken again.