comment/debug cleanup