Remove code deprecated by the use of runner