Removed obsolete use statements and added missing statements.
Merge pull request #77 from frmwrk123/technicalDebt/use

Removed obsolete use statements and added missing statements.