Testing a removal of old cruft.
Updates.
More testing.