Cleanup.
Merge pull request #277 from DoSomething/cleanup

Cleanup.
Release v3.12.1