Some cleanup, removing v1 sample
Some cleanup, removing v1 sample