ERC message notification tweaks
Code cleanup and debug code removal