Clean up more cruft!