Like it says on the tin. A bit of clearout of un-needed stuff.

@ptrelease @opyate eh up, one more for you guys.