v2.0.1 cleanup

cleanup