Parse prep and optionals cleanup