entity fetching cleanup