cleanup debug() usage
2.2.1