Updated URI and removed commented out code.