Remove unused/unimplemented settings

Change-Id: Iaed344d1df1097ee693290c88aab04303ba968a4