Removed obsolete config values

Change-Id: I1e027e3deb853da0949a3680c7202891b165d399
Merge pull request #1 from pluginblank/cm12.0

Removed obsolete config values