Removing commented debug code