[DEBT] - removed commented code.