Removed unused imports, minor cleanups
Merge pull request #179 from smarthi/suneel

Removed unused imports, minor cleanups