Remove the wait-operations on the PS side.