Fix cascading validation with sf2.1
Remove obsolete code, now built in with sf2.1
Remove non stable feature