Removed configuration options that will not get into the first release.