debug helper, more clean up