Cleanup Widget Repo/Code Part 1