Cleanup

Change-Id: Ibbfc85a73b69986368769c4910ced0de6f96cdae