remove all uses of KcServiceLocator and replace with DI.  Ex: KcServiceLocator.getService(QuestionnaireAnswerService.class);