Remove junk

This PR remove some dead code.
It relies on PR #316.