RR: removed some commented out code.