Removing remaining debug statements