[sdlparser] Cleanup