Phab update fixed_settings updates

* updated comments and notes
* comment out settings not yet needed
* cleanup

Change-Id: I7482fca48129d5c57ba8ec72c598af435c91de24