Fixed imports; removed unused imports
removed leftover code from merge.
Removed unused imports.