A bit of cleaning

(-) messages, sleep, …