enhance performance of removeFields command