Re: COM implementation clean up