Clean up parser remove experimental features