Settings cleanup
New XBMC