Removed old yaml attributes, merge cleanup [skip ci]