Removing extra debug statements