Remove untested and unused code