Cleanup a bit, also get rid of dynamic pointless messages confusion