Merge "removed unused imports lowered code smells"