a few deletions
Merge branch 'cleanup'