Removes some garbage.

For cleanest series of commits ever!