Obsolete external site calls, update tests.