Remove more obsolete entries