Minor import cleanup