Remove svi-data dependency