Removing duplicate controls upon adding an expander