Removing some deprecated usage