code cleanup - removing unused imports etc..