Build option cleanup