Cleanup

Change-Id: I1c4c805c54abcf4ec150945f71de14f4a96fcdbb