Next, you need to create list of all packages on n900 and write which package is upstream, which upstream + nokia specified patches and which are nokia's packages. Obviously you cannot remove nokia specified patches...