5.1 Some prio stuff removed