SLICE-8 Removing CQMapperFactory