Delete finished messages

- [x] @EEE3 - please test and merge