Removed obsolete imports.
Merge pull request #217 from frmwrk123/cleanup

Removed obsolete imports.