Remove obsolete entries

Bug: 299029620
Change-Id: I8cb8d78099656d515feca434073a367908d5fddd
3 files changed