Removing dead code and general cleansing: refs #516
 Issue on listbox/fields based on master data in the master instance: refs  #568