cleaned custom notifications up