[CDF-205] - CDF core-refactor
	- Removed unnecessary import