Small import cleanup