Removed more runtime reference calls