Some housekeeping before the initial development of UI plugin