Re: [development] Core scripts cleanup