A couple of small fixes removing unneeded variables