Cleanup of config options and pillars

Change-Id: I28bbfd7a37e7106ed382ee2fce1ebc872af870cc
Merge "Cleanup of config options and pillars" into production