Remove some old an unused code