remove clutter
Merge branch 'grosser-grosser/cleanup'
Bump version to 2.0.3 (for mail 2.6.1)
WIP