Update Toaster OnUse

Cleanup