stop using findAndRemove mongo method

seems to lock mongod under certain circumstances (when there's contention on the same _id)
Merge branch 'fix_mongo_lock'