Cleanup to remove some ifdef