reactivate 'dead' code in version.cc
improve += options
change zone backup during tests to zone restore
remove unused files