Minor cleanup: remove dead code; formatting.