Got rid of extra messages