Some more cleanup to be more compliant