Minor rename + remove unused imports.