Remove references to toast