Clean up and simplifcation of linked show filling