Remove dead code
Remove dead code
More code cleanup