Remove hackfix for transfer to conveyor 2
This should fully remove the hackfix (untested)