Remove dead code
Remove more dead code