Removing dependencies on DCF and CIM questionaire.