DATAES-46 - Remove unused imports & class