fix messages listeners / remove most group related code