remove temporary debugging code (remaining in 2.1)
release 2.1.1