Clean-up
Merge branch 'cleanup'