Clean up advanced.yml comments and keys