Deep Clean

I was pruning local branches and found some older cleanups which I hadn't submitted. Rebased for your reviewing pleasure @vinniefalco and @ximinez