cleanup, adding models for widget instances