Remove some old code thats no longer used