Deprecation hunting

Removing more deprecated stuff.