Commnted out some changes Vedat has put in for Mongo