Remove TrailblockDescription and friends
Remove tests using SafeName
Merge branch 'remove-models'