Committed after removing unused imports