More cleanup which includes removing unused imports etc