Fix indentation
Remove dead code