I've removed commented code.