Yeah the /sbin/lilo -u will uninstall it as well.
Now, what I can't remember is whether or not Linux's fdisk will change partition info non-destructively. I think it does, but I'm not sure.
If you want to combine it all into one partition you're going to need something like Partition Magic.