Simplify / fix backup scripts