debug cleanup
fixes #18