Remove debug print statements
Merge branch 'maint'