Remove debug code. Enhance class removal regular expression.