Fixing snaphot/restore features, polishing not needed commands