End of cleanups I think