Cleanup: deleted unused configuration settings

Change-Id: I7287e098b561df9460cd70a32858ce6b796b6504
Merge "Cleanup: deleted unused configuration settings"