Removing debug code
Merge pull request #108 from Dapid/fix_xxx

Removing debug code