Remove dead code

This code has been removed from the build/commented out for ages and serves us no value.

Consequently it would make our code more readable if we remove them.

@dfaure