more performance enhancements for removeFields command