debugging disabled by default
Merge branch 'coffee-cleanup'