sweeping cleanup / helixification