remove debugging code
Merge branch 'debugging'