Removed obsoleted stuff.