Cleanup

Change-Id: I35a4d4a6144e5baa9d537c45c52e0e8af3dd7ab3