updated parser to support clean.