Settings branch clean up