Remove all parts of 'shef'
Merge pull request #2499 from juliandunn/trash-shef

Remove all parts of 'shef'