Yet more cleaning

Clean up week is over, yet the graveyard--err, i mean office could use a bit of work.