Fix some XBMC relicts