Removed unnecessary config setting.
Merged changes.