Cleanup.
Merge pull request #277 from DoSomething/cleanup

Cleanup.