Optimization option to use remove mass trick