Clean up

Remove commented-out code.