removed some indirect access