Adding messages and removing some unnecessary pipelining params