Fixed Removals for Mongo and YAML