More cleaning up

entering and exiting msgs