A bit of code cleanup; on a +Hangout

Fun no?

:neckbeard: 
We should probably remove these at some point