Removed obsolete code

Change-Id: I035681e3c59e54c052fccaa2507481e8d2076324