More cleanup
I'm stupid