Clean up some of the generated mess.

Sadness Ben. Sadness. :unamused: