Some final cleanup

Hopefully that's it!