Re: Some comps cleanup