Code cleanup after CR-IC-4191
new UI for plugins