Cutdown on settings

Change-Id: I5c062fcf9fef5847a4ff693c598308decb58c857