Un-used import cleanup