chore(admin/plugin): cleanup code

related to CAM-1882, CAM-1960