Remove debugging/dead code