#198 cleanup imports