Remove unused code

* Unused legacy code