Disable the subqueries early clean up because it can be called a couple of times for join