Removing redundant Toast messages