More precise cleaning of debug statements