Cleanup code

Change-Id: I8eb19d4037d5498b0387ef5ccb40359df81e70ab