code cleanup - removing some unused imports