Remove unused/dead code.

Pitty, because we did port it, but parently don't need it anymore