summary: removed commented-out code