Removed commented-out and unused code