Remove more obsolete code from Orca's Evolution support