Some refactor, delete messages still not work
Delete of messages working