Delete some dead code
Remove lots of dead code