Removed leftovers of Vidi