Remove dead-code that was not merged