Temp remove pipelining