Remove software restore from software manager

plus some small fixes regarding restore wizard