Trying to cleanup all the broken things that I've made