JDF-670: Remove unused imports