#198 cleanup