COM implementation clean up