Parsing cleanup