issues/699: cleanup