remove some (apparently) obsolete entries.
please put them back in if they're still valid, and remove others
that are outdated