Cleanup and reshufling of configuration parameters - part II.