Removed unnecessary Toasts