cleanup expanded relation includes for queries