Remove some of the refresh logic (first attempt)