Re: [core] cleanup