Removed unnecessary fetches