Removing some more deprecated usage