#198 import cleanup