Remove unused code

Change-Id: I82c60110c1cf54a0aa210db2ae8cbd759773741e