Clean up some other scary stuff