Simplify restore logic