Remove experimental code