Removed echo messages that I forgot to remove earlier