removing more direct saved variable access
removing even more direct saved variable access - this should be good for now