Updated uninstall to use components rather than component files.
Minor changes including fp clean ups.