Add some changes for ord-notifier. Also clean up unnecessary code. Change-Id: I60fb157a8159fa1e30f2effb99cb9273d09a9ddd