cleanup to match WP repo