Remove obsolete entries

Change-Id: Iac9b479ba3995e8ccd00fcbadb60a3e6743209ed