All of this commented stuff should just be removed.