code maid cleanup

Change-Id: Ice3456c65d63898db76dcb840a79436923198e15