rm obsolete commented-out code