Code cleanup - Stripping unused imports