Removed toasts and unused code