removal of old commented-out code