Cleanup debugging messages
Merge branch 'master' into noidf