Some clean-up

Change-Id: I8603b2644a63d57987c3e539e8282a0c562cfe60