Remove commented debug/dead code