Removing some deprecated conditionals.