Some minor cleaning up (removed our debug traces).