Additional cleanup; removing settings from attributes list.