More mongoDB logic cleanup. Everything working again.