Cleaning up unused import and identifier.