Add some samples
Remove old wrapper code