Remove deprecated settings / hacks

Change-Id: I5b9838e2af0b886b815b5f1f462ff7fb8fc6ffe9
Merge "Remove deprecated settings / hacks" into cm-10.2