[PATCH 2/2] Remove unused imports