More query cleanup.