Fix build

More will be removed later.  Needs source side of things
removed as well before it wont break Settings.