Cleanup after upstream merges

Some  changes are not needed anymore.