Implicit cleanups
Merge pull request #524 from twitter/implicit-cleanup

Implicit cleanups