Add owner to messages
Remove unused codes and fix double messages