Update to 4.1. Tests. Deprecate replacements.