Cleanup dead code, re-indent.