Remove some now-unneeded fetching