Remove dead code
More general cleanup