More import cleanup

@scottpurdy