Post-merge cleanups, remove the old message handling