Mark every setting as required, minor cleanup