Remove an unused import.
Remove some old unused code.