Add notifications
Remove commented out code