One more queries cleanup.