Remove non working code