More removal of grabbing values from scope\!