Some notification cleanup

Implement receive body and remove redundant settings. Also add upgrader code to port existing settings from 2.0 to 2.1. It's untested, can anyone help me with that?