remove test points
disabled xfade, using reset everywhere