Removed diagnostic toasts
Cleaned up code