Remove hackfix for transition from conveyor 1(WIP)