remove a bit of junk
Merge branch 'v4'