More cleaning up

I promise itll be clean.