Clean-up
Remove unnecessary logging
Refactor
More refactoring
Release 2.1