Code clarification
RefreshControls

This should be safe; in case of empty combo boxes, the exception
handling of Add/Remove/Rename should cover us.
Revert "RefreshControls"

This reverts commit b5827d2f745cdfd69dc15e7264dabe86f325c890.