Finish install/uninstall tasks for 3.1 support