Re: cruft removal