change messaging system
remove duplicate key