Cleanup

Change-Id: Ia5a1d8aecb85633ca7f8aeb6254f7f8173c4f618