Code cleanup - removing unused imports