Removing waitReply on cancel & added metrics