Starting a query cleanup to reduce database calls that aren't needed.