Removes experimental code from mainline.