get rid of debug info
Merge branch 'candycane'