Removed unnessecary msg defs.