Remove dead code

There's a lot of dead code still floating around. Low hanging fruit for anyone who wants to clean it up I suppose.