Adjust formatting and remove dead code.