reducing bloat
Merge pull request #514 from metamx/reduce-bloat

Reduce some bloat in the code base