Minor clean up

Unnecessary debug traces and TODO removed