Correct typos, remove superfluous message elements, restore lifecycle management