#164 cleanup