cleanup mongo refactor