added back message trace and exchange interceptor; more cleanup to be done