Remove unneeded inherits.
Merge branch 'add_serfdom' into tsp-demo