rm debug hardcoding
Merge branch 'master' into unit-tests