WIP clearing up on uninstall