Fixed links in notifications
Fixed cleanup