remove dependencies on deprecated magic values
update messaging framework