Removing commented out mongo-centric code