Move policy calculations to not happen every step