Clean up parsing spec