We might as well delete all of this rather than commenting-out... unless there is a reason you chose to leave it?