Parsers cleanup