removed message unneeded message check