remmoving message related code