tidied out messages and prompts etc