Remove logging, and non-required things

Change-Id: Ia9e6741ddf8de3ce2aa54e521cbbe031f95e00cb