removed state from many calls