REL-2100: Removed commented code.