Code

cleanup: Remove some commented-out code.