Clean up of XBMC Client code