Repairs demos. Removes deprecated API usage