Adding class removal to compiler.  _classes -> _cls