Cleanup

Remove unused function and unnecessary import.