#226 cleanup