beta 5 end - Remove unneeded Toast