Housekeeping

Removed some useless old junk for clarity's sake.