Cleanup

Change-Id: Id4ef4a979713bdcc6452521fc336d2d40cc1dc1d