Few minor fixes. Unused imports removed