Remove commented-out code that is no longer needed