diff --git a/lib/refrepo/gen/wiki/generators/cpu_parameters.rb b/lib/refrepo/gen/wiki/generators/cpu_parameters.rb
index 013c1f7b9961bc2030bdd9a139cedea307cea8c5..550765aba45fb335babaf94632958ac28252fa6d 100644
--- a/lib/refrepo/gen/wiki/generators/cpu_parameters.rb
+++ b/lib/refrepo/gen/wiki/generators/cpu_parameters.rb
@@ -55,23 +55,3 @@ class CPUParametersGenerator < WikiGenerator
     @generated_content += MW::LINE_FEED
   end
 end
-
-if __FILE__ == $0
-  generator = CPUParametersGenerator.new("Generated/CPUParameters")
-
-  options = WikiGenerator::parse_options
-  if (options)
-    ret = 2
-    begin
-      ret = generator.exec(options)
-    rescue MediawikiApi::ApiError => e
-      puts e, e.backtrace
-      ret = 3
-    rescue StandardError => e
-      puts e, e.backtrace
-      ret = 4
-    ensure
-      exit(ret)
-    end
-  end
-end
diff --git a/lib/refrepo/gen/wiki/generators/disk_reservation.rb b/lib/refrepo/gen/wiki/generators/disk_reservation.rb
index b88db2dc21aed6c2b0a7857f2f64b6adb0dfa5a3..8489b70f41af7288403aa72a992033736ec7f61d 100644
--- a/lib/refrepo/gen/wiki/generators/disk_reservation.rb
+++ b/lib/refrepo/gen/wiki/generators/disk_reservation.rb
@@ -59,24 +59,3 @@ class DiskReservationGenerator < WikiGenerator
     end
   end
 end
-
-if __FILE__ == $0
-  generator = DiskReservationGenerator.new("Generated/DiskReservation")
-
-  options = WikiGenerator::parse_options
-  pp options
-  if (options)
-    ret = 2
-    begin
-      ret = generator.exec(options)
-    rescue MediawikiApi::ApiError => e
-      puts e, e.backtrace
-      ret = 3
-    rescue StandardError => e
-      puts e, e.backtrace
-      ret = 4
-    ensure
-      exit(ret)
-    end
-  end
-end
diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb
index 07e9c5e56720a1a4589c04fb06c64ded3cf95efa..9abab8f66e43834df8a12e7ccaa47fde48972d8a 100644
--- a/lib/refrepo/gen/wiki/generators/hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/hardware.rb
@@ -479,24 +479,3 @@ class G5KHardwareGenerator < WikiGenerator
     end
   end
 end
-
-if __FILE__ == $0
-  generator = G5KHardwareGenerator.new("Hardware")
-
-  options = WikiGenerator::parse_options
-  if (options)
-    ret = 2
-    begin
-      ret = generator.exec(options)
-    rescue MediawikiApi::ApiError => e
-      puts e, e.backtrace
-      ret = 3
-    rescue StandardError => e
-      puts "Error with node: #{generator.instance_variable_get(:@node)}"
-      puts e, e.backtrace
-      ret = 4
-    ensure
-      exit(ret)
-    end
-  end
-end
diff --git a/lib/refrepo/gen/wiki/generators/oar_properties.rb b/lib/refrepo/gen/wiki/generators/oar_properties.rb
index 360e25956e19eb4c9595d72517c9e85f2c326ebd..fb0116632da090059c7f24878b5710e66f732e1b 100644
--- a/lib/refrepo/gen/wiki/generators/oar_properties.rb
+++ b/lib/refrepo/gen/wiki/generators/oar_properties.rb
@@ -314,23 +314,3 @@ class OarPropertiesGenerator < WikiGenerator
     @generated_content += MW::LINE_FEED
   end
 end
-
-if __FILE__ == $0
-  generator = OarPropertiesGenerator.new("OAR_Properties")
-
-  options = WikiGenerator::parse_options
-  if (options)
-    ret = 2
-    begin
-      ret = generator.exec(options)
-    rescue MediawikiApi::ApiError => e
-      puts e, e.backtrace
-      ret = 3
-    rescue StandardError => e
-      puts e, e.backtrace
-      ret = 4
-    ensure
-      exit(ret)
-    end
-  end
-end
diff --git a/lib/refrepo/gen/wiki/generators/site_network.rb b/lib/refrepo/gen/wiki/generators/site_network.rb
index f30e8777e17d62612cce520772f8fa5d94b8b3ba..cf6c77048f6c24e6d42712d6b6a3729ff1612868 100644
--- a/lib/refrepo/gen/wiki/generators/site_network.rb
+++ b/lib/refrepo/gen/wiki/generators/site_network.rb
@@ -38,26 +38,3 @@ class SiteNetworkGenerator < WikiGenerator
     check_network_description({:sites => [@site], :dot => true})
   end
 end
-
-if __FILE__ == $0
-  options = WikiGenerator::parse_options
-
-  if (options)
-    ret = 2
-    begin
-      ret = true
-      generators = options[:sites].map{ |site| SiteNetworkGenerator.new('Generated/' + site.capitalize + 'Network', site) }
-      generators.each{ |generator|
-        ret &= generator.exec(options)
-      }
-    rescue MediawikiApi::ApiError => e
-      puts e, e.backtrace
-      ret = 3
-    rescue StandardError => e
-      puts e, e.backtrace
-      ret = 4
-    ensure
-      exit(ret)
-    end
-  end
-end
diff --git a/lib/refrepo/gen/wiki/generators/status.rb b/lib/refrepo/gen/wiki/generators/status.rb
index 49d013874a32b85a62553fab78696d3b518075e9..28d8a67e50d9fd275ab289513ff3d8e5a05d2f96 100644
--- a/lib/refrepo/gen/wiki/generators/status.rb
+++ b/lib/refrepo/gen/wiki/generators/status.rb
@@ -193,24 +193,3 @@ class StatusGenerator < WikiGenerator
     false
   end
 end
-
-if __FILE__ == $0
-  generator = StatusGenerator.new("Status")
-
-  options = WikiGenerator::parse_options
-  if (options)
-    ret = 2
-    begin
-      ret = generator.exec(options)
-    rescue MediawikiApi::ApiError => e
-      puts e, e.backtrace
-      ret = 3
-    rescue StandardError => e
-      puts "Error with node: #{generator.instance_variable_get(:@node)}"
-      puts e, e.backtrace
-      ret = 4
-    ensure
-      exit(ret)
-    end
-  end
-end
diff --git a/lib/refrepo/gen/wiki/wiki_generator.rb b/lib/refrepo/gen/wiki/wiki_generator.rb
index 7a0653c4a39493e988ee9bc98bf504a3069e3c7c..96731a8fc1940e3885a99a1536820fb71fa272e1 100644
--- a/lib/refrepo/gen/wiki/wiki_generator.rb
+++ b/lib/refrepo/gen/wiki/wiki_generator.rb
@@ -112,64 +112,6 @@ class WikiGenerator
     puts '----------- GENERATED PAGE END -----------'
   end
 
-  #Generic static method for cli arguments parsing
-  def self.parse_options
-    conf = ENV['HOME']+'/.grid5000_api.yml'
-    yconf = YAML::load(IO::read(conf)) rescue {}
-    api_user = yconf['username']
-    api_password = yconf['password']
-
-    options = {
-      :generators => [],
-      :sites => ['global'] + G5K::SITES,
-      :diff => false,
-      :print => false,
-      :update => false,
-      :user => ENV['API_USER'] || api_user,
-      :pwd => ENV['API_PASSWORD'] || api_password
-    }
-
-    opt_parse = OptionParser.new do |opts|
-      opts.banner = "Usage: wikigen\n"
-      opts.banner += "This script looks for file ~/.grid5000_api.yml containing your API username and password credentials. The script also recognize API_USER and API_PASSWORD environment variables."
-
-      opts.on('-g', '--generators=generator1,generator2', Array, 'Run those generators') do |g|
-        options[:generators] = g
-      end
-      
-      opts.on('-s', '--sites=site1,site2', Array, 'Only consider these sites (when applicable)') do |sites|
-        options[:sites] = sites.map{ |e| e.downcase }
-      end
-      
-      opts.on('-d', '--diff', 'Print a diff of the current wiki page against the content to generate') do
-        options[:diff] = true
-      end
-
-      opts.on('-u', '--update', 'Update the wiki page with the new generated content') do
-        options[:update] = true
-      end
-
-      opts.on('-o', '--print', 'Print the new generated content on stdout') do
-        options[:print] = true
-      end
-
-      # Print an options summary.
-      opts.on("-h", "--help", "Show this message") do
-        puts opts
-        exit
-      end
-
-      opts.separator ""
-      opts.separator "Generators: #{GENERATORS.keys.join(' ')}"
-    end
-    opt_parse.parse!
-    if (!options[:diff] && !options[:print] && !options[:update])
-      puts "ERROR: At least one action must be given! (--diff, --print, --update)\n#{opt_parse}"
-      exit(1)
-    end
-    return options
-  end
-
   #Execute actions on generator based on given options
   def exec(options)
     generate_content()