Very minor changes (unused imports cleaning).