Cleanup of commented-out code