[CLEANUP] - Removing unused imports
Merge pull request #560 from brosander/PDI-12188-2

Removing unused imports