cleanup of parsing rules