Temporarily removed ondemandplus and lionheart