Format
Remove commented-out code