Code cleanup. unused imports etc