Remove/undeprecate some deprecated stuff.