More removal of MongoDB logic from app