Even more cleanup...

This is very boring... :(