Remove code merged in pacemaker pr #12