From eb6301e023e8cfa9d83fbbfc6ca5797b62d8d535 Mon Sep 17 00:00:00 2001
From: Radim Blazek <radim.blazek@gmail.com>
Date: Wed, 12 Jul 2017 17:51:03 +0200
Subject: [PATCH] [GRASS] remove GRASS 6 support

---
 CMakeLists.txt                                |  19 +--
 cmake/FindGRASS.cmake                         |  17 +-
 debian/rules                                  |   5 -
 ms-windows/osgeo4w/package-nightly.cmd        |   1 -
 ms-windows/osgeo4w/package.cmd                |   1 -
 src/plugins/grass/modules/db.in.ogr.qgm       |   3 +-
 src/plugins/grass/modules/db.out.ogr.qgm      |   6 +-
 src/plugins/grass/modules/db.select.qgm       |   3 +-
 .../modules/g.region.multiple.raster.qgm      |   3 +-
 .../modules/g.region.multiple.vector.qgm      |   3 +-
 src/plugins/grass/modules/i.fft.qgm           |  10 +-
 src/plugins/grass/modules/i.his.rgb.qgm       |  18 +--
 src/plugins/grass/modules/i.ifft.qgm          |   9 +-
 src/plugins/grass/modules/i.image.mosaic.qgm  |   8 +-
 src/plugins/grass/modules/i.in.spotvgt.qgm    |   6 +-
 src/plugins/grass/modules/i.oif.qgm           |  10 +-
 src/plugins/grass/modules/i.rgb.his.qgm       |  18 +--
 src/plugins/grass/modules/i.tasscap4.qgm      |  14 +-
 src/plugins/grass/modules/i.tasscap5.qgm      |  14 +-
 src/plugins/grass/modules/i.tasscap7.qgm      |  14 +-
 src/plugins/grass/modules/m.cogo.qgm          |   3 +-
 src/plugins/grass/modules/m.proj.qgm          |   6 +-
 src/plugins/grass/modules/r.basins.fill.qgm   |   9 +-
 src/plugins/grass/modules/r.carve.qgm         |   6 +-
 src/plugins/grass/modules/r.circle.qgm        |   6 +-
 src/plugins/grass/modules/r.coin.qgm          |   6 +-
 src/plugins/grass/modules/r.colors.stddev.qgm |   3 +-
 src/plugins/grass/modules/r.composite.qgm     |   9 +-
 src/plugins/grass/modules/r.cost.coord.qgm    |   8 +-
 src/plugins/grass/modules/r.cost.rast.qgm     |   8 +-
 src/plugins/grass/modules/r.cost.vect.qgm     |   4 +-
 src/plugins/grass/modules/r.describe.qgm      |   6 +-
 src/plugins/grass/modules/r.distance.qgm      |  14 +-
 src/plugins/grass/modules/r.drain.qgm         |   4 +-
 src/plugins/grass/modules/r.fill.dir.qgm      |   8 +-
 src/plugins/grass/modules/r.his.qgm           |  24 +--
 src/plugins/grass/modules/r.in.ascii.qgm      |  16 +-
 src/plugins/grass/modules/r.in.wms.qgm        |  36 ++---
 src/plugins/grass/modules/r.in.xyz.qgm        |   4 +-
 src/plugins/grass/modules/r.info.qgm          |   2 +-
 src/plugins/grass/modules/r.lake.seed.qgm     |   8 +-
 src/plugins/grass/modules/r.lake.xy.qgm       |  12 +-
 src/plugins/grass/modules/r.out.ascii.qgm     |   8 +-
 src/plugins/grass/modules/r.out.mpeg.qgm      |   4 +-
 src/plugins/grass/modules/r.out.pov.qgm       |   8 +-
 src/plugins/grass/modules/r.out.ppm.qgm       |   4 +-
 src/plugins/grass/modules/r.out.vrml.qgm      |   8 +-
 src/plugins/grass/modules/r.out.vtk.qgm       |  12 +-
 src/plugins/grass/modules/r.out.xyz.qgm       |   4 +-
 src/plugins/grass/modules/r.param.scale.qgm   |   4 +-
 src/plugins/grass/modules/r.plane.qgm         |   4 +-
 src/plugins/grass/modules/r.random.qgm        |   8 +-
 src/plugins/grass/modules/r.random.raster.qgm |   8 +-
 .../grass/modules/r.reclass.area.greater.qgm  |   6 +-
 .../grass/modules/r.reclass.area.lesser.qgm   |   6 +-
 .../grass/modules/r.regression.line.qgm       |   8 +-
 src/plugins/grass/modules/r.resamp.rst.qgm    |   4 +-
 src/plugins/grass/modules/r.stats.qgm         |   8 +-
 src/plugins/grass/modules/r.surf.area.qgm     |   6 +-
 src/plugins/grass/modules/r.surf.fractal.qgm  |  12 +-
 src/plugins/grass/modules/r.texture.bis.qgm   |  20 +--
 src/plugins/grass/modules/r.texture.qgm       |  20 +--
 src/plugins/grass/modules/r.to.vect.area.qgm  |   4 +-
 src/plugins/grass/modules/r.to.vect.line.qgm  |   4 +-
 src/plugins/grass/modules/r.to.vect.point.qgm |   4 +-
 src/plugins/grass/modules/r.volume.qgm        |   4 +-
 src/plugins/grass/modules/r.walk.coord.qgm    |   8 +-
 src/plugins/grass/modules/r.walk.vect.qgm     |   4 +-
 src/plugins/grass/modules/r.water.outlet.qgm  |  14 +-
 .../grass/modules/r.what.coordinates.qgm      |  18 +--
 src/plugins/grass/modules/v.buffer.qgm        |   4 +-
 .../grass/modules/v.clean.chdangles.qgm       |   4 +-
 src/plugins/grass/modules/v.clean.prune.qgm   |   4 +-
 src/plugins/grass/modules/v.clean.rmarea.qgm  |   4 +-
 .../grass/modules/v.clean.rmdangles.qgm       |   4 +-
 src/plugins/grass/modules/v.clean.snap.qgm    |   4 +-
 src/plugins/grass/modules/v.db.join.qgm       |   8 +-
 src/plugins/grass/modules/v.db.select.qgm     |   8 +-
 .../grass/modules/v.db.select.where.qgm       |   8 +-
 src/plugins/grass/modules/v.db.univar.qgm     |   8 +-
 src/plugins/grass/modules/v.db.update_op.qgm  |   4 +-
 .../grass/modules/v.db.update_op_query.qgm    |   4 +-
 src/plugins/grass/modules/v.drape.qgm         |   4 +-
 src/plugins/grass/modules/v.extract.list.qgm  |   4 +-
 src/plugins/grass/modules/v.extrude.attr.qgm  |   4 +-
 src/plugins/grass/modules/v.generalize.qgm    |   2 +-
 src/plugins/grass/modules/v.hull.qgm          |   4 +-
 src/plugins/grass/modules/v.in.ascii.qgm      |   4 +-
 src/plugins/grass/modules/v.in.e00.qgm        |   8 +-
 .../grass/modules/v.in.ogr.all.loc.qgm        |   8 +-
 src/plugins/grass/modules/v.in.ogr.all.qgm    |   8 +-
 src/plugins/grass/modules/v.in.ogr.loc.qgm    |   8 +-
 .../grass/modules/v.in.ogr.qgis.loc.qgm       |   8 +-
 src/plugins/grass/modules/v.in.ogr.qgis.qgm   |   8 +-
 src/plugins/grass/modules/v.in.ogr.qgm        |   8 +-
 src/plugins/grass/modules/v.info.qgm          |   2 +-
 src/plugins/grass/modules/v.kcv.qgm           |  10 +-
 src/plugins/grass/modules/v.kernel.qgm        |   8 +-
 src/plugins/grass/modules/v.net.alloc.qgm     |  12 +-
 src/plugins/grass/modules/v.net.iso.qgm       |  12 +-
 src/plugins/grass/modules/v.net.nodes.qgm     |   8 +-
 src/plugins/grass/modules/v.net.path.qgm      |  20 +--
 src/plugins/grass/modules/v.net.qgm           |  14 +-
 src/plugins/grass/modules/v.net.salesman.qgm  |  12 +-
 src/plugins/grass/modules/v.net.steiner.qgm   |  12 +-
 .../grass/modules/v.net.visibility.qgm        |   8 +-
 src/plugins/grass/modules/v.out.ascii.qgm     |   4 +-
 src/plugins/grass/modules/v.out.ogr.gml.qgm   |   8 +-
 .../grass/modules/v.out.ogr.mapinfo.qgm       |   4 +-
 src/plugins/grass/modules/v.out.ogr.qgm       |   8 +-
 src/plugins/grass/modules/v.out.vtk.qgm       |   4 +-
 src/plugins/grass/modules/v.outlier.qgm       |  18 +--
 src/plugins/grass/modules/v.random.3d.qgm     |   6 +-
 src/plugins/grass/modules/v.random.qgm        |   4 +-
 src/plugins/grass/modules/v.rast.stats.qgm    |   8 +-
 src/plugins/grass/modules/v.sample.qgm        |   6 +-
 src/plugins/grass/modules/v.segment.qgm       |   8 +-
 src/plugins/grass/modules/v.support.qgm       |   4 +-
 src/plugins/grass/modules/v.surf.bspline.qgm  |  16 +-
 src/plugins/grass/modules/v.surf.rst.qgm      |  36 ++---
 src/plugins/grass/modules/v.to.db.qgm         |   4 +-
 src/plugins/grass/modules/v.to.points.qgm     |   8 +-
 src/plugins/grass/modules/v.to.rast.attr.qgm  |   4 +-
 src/plugins/grass/modules/v.type.bl.qgm       |   6 +-
 src/plugins/grass/modules/v.type.cp.qgm       |   6 +-
 src/plugins/grass/modules/v.type.lb.qgm       |   6 +-
 src/plugins/grass/modules/v.type.pc.qgm       |   6 +-
 src/plugins/grass/modules/v.what.rast.qgm     |   8 +-
 src/plugins/grass/modules/v.what.vect.qgm     |  16 +-
 src/plugins/grass/qgsgrassmodule.cpp          |   8 -
 src/plugins/grass/qgsgrassmoduleinput.cpp     |  10 --
 src/plugins/grass/qgsgrassmoduleinput.h       |   4 -
 src/plugins/grass/qgsgrassmoduleoptions.cpp   |   8 -
 src/plugins/grass/qgsgrassmoduleparam.cpp     |  11 --
 src/plugins/grass/qgsgrassnewmapset.cpp       |   4 -
 src/plugins/grass/qgsgrassplugin.cpp          |   9 --
 src/plugins/grass/qgsgrassselect.cpp          |   5 -
 src/plugins/grass/qgsgrasstools.cpp           |   5 +-
 src/providers/grass/qgis.d.rast.c             |  60 ++-----
 src/providers/grass/qgis.g.info.c             | 129 ++++-----------
 src/providers/grass/qgis.r.in.cpp             |  53 ++-----
 src/providers/grass/qgis.v.in.cpp             |   9 --
 src/providers/grass/qgsgrass.cpp              | 147 +++---------------
 src/providers/grass/qgsgrass.h                |  18 ---
 .../grass/qgsgrassfeatureiterator.cpp         |  16 +-
 src/providers/grass/qgsgrassgislib.cpp        |  12 --
 src/providers/grass/qgsgrassprovider.cpp      |  22 +--
 .../grass/qgsgrassprovidermodule.cpp          |   4 -
 src/providers/grass/qgsgrassrasterprovider.h  |   2 -
 src/providers/grass/qgsgrassvector.cpp        |   5 -
 src/providers/grass/qgsgrassvectormap.cpp     |  16 --
 .../grass/qgsgrassvectormaplayer.cpp          |   5 -
 src/providers/grass/qgsgrassvectormaplayer.h  |   5 -
 .../providers/grass/testqgsgrassprovider.cpp  |   8 +-
 154 files changed, 576 insertions(+), 1063 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af5fe04ab9e..2710829faee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,19 +38,16 @@ SET (WITH_CORE TRUE CACHE BOOL "Determines whether QGIS core should be built.")
 MARK_AS_ADVANCED(WITH_CORE)
 
 IF(WITH_CORE)
-  # try to configure and build GRASS plugin by default
-  FOREACH (GRASS_SEARCH_VERSION 6 7)
-    # For GRASS 6 are used cached variables without version suffix so that existing caches don't have to be reconfigured.
-    # Cached variables: WITH_GRASS, WITH_GRASS7, GRASS_PREFIX, GRASS_PREFIX7, GRASS_INCLUDE_DIR, GRASS_INCLUDE_DIR7
+  # Only GRASS 7 is currently supported but we keep dual version support in cmake for possible future switch to GRASS 8.
+  # Try to configure and build GRASS plugin by default
+  FOREACH (GRASS_SEARCH_VERSION 7)
+    # Legacy note:
+    # For GRASS 6 there were used cached variables without version suffix so that existing caches didn't have to be reconfigured.
+    # Cached variables were: WITH_GRASS, WITH_GRASS7, GRASS_PREFIX, GRASS_PREFIX7, GRASS_INCLUDE_DIR, GRASS_INCLUDE_DIR7
     # Everywhere else each variable has version major appended.
-    # Normal variables: GRASS_FOUND6, GRASS_FOUND7, GRASS_MAJOR_VERSION6, GRASS_MAJOR_VERSION7, etc.
+    # Normal variables were: GRASS_FOUND6, GRASS_FOUND7, GRASS_MAJOR_VERSION6, GRASS_MAJOR_VERSION7, etc.
     # In addition there is also GRASS_FOUND, which is TRUE if at least one version of GRASS was found
-    IF (GRASS_SEARCH_VERSION EQUAL 6)
-      SET (GRASS_CACHE_VERSION "")
-    ELSE (GRASS_SEARCH_VERSION EQUAL 6)
-      SET (GRASS_CACHE_VERSION ${GRASS_SEARCH_VERSION})
-    ENDIF (GRASS_SEARCH_VERSION EQUAL 6)
-
+    SET (GRASS_CACHE_VERSION ${GRASS_SEARCH_VERSION})
     SET (WITH_GRASS${GRASS_CACHE_VERSION} TRUE CACHE BOOL "Determines whether GRASS ${GRASS_SEARCH_VERSION} plugin should be built")
     IF (WITH_GRASS${GRASS_CACHE_VERSION})
       FIND_PACKAGE(GRASS ${GRASS_SEARCH_VERSION})
diff --git a/cmake/FindGRASS.cmake b/cmake/FindGRASS.cmake
index 64cfebbe27f..346c78a5be0 100644
--- a/cmake/FindGRASS.cmake
+++ b/cmake/FindGRASS.cmake
@@ -137,12 +137,6 @@ MACRO (CHECK_GRASS G_PREFIX)
           SET(GRASS_FOUND TRUE) # GRASS_FOUND is true if at least one version was found
           SET(GRASS_PREFIX${GRASS_CACHE_VERSION} ${G_PREFIX})
           CHECK_GRASS_EXTRA_INCLUDE_DIRS(${GRASS_FIND_VERSION})
-          IF(GRASS_FIND_VERSION EQUAL 6)
-            # Set also normal variable with number
-            SET(GRASS_INCLUDE_DIR${GRASS_FIND_VERSION} ${GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION}})
-            SET(GRASS_PREFIX${GRASS_FIND_VERSION} ${G_PREFIX})
-            CHECK_GRASS_EXTRA_INCLUDE_DIRS(${GRASS_FIND_VERSION})
-          ENDIF(GRASS_FIND_VERSION EQUAL 6)
         ENDIF(GRASS_LIBRARIES_FOUND${GRASS_FIND_VERSION})
     ENDIF(GRASS_MAJOR_VERSION${GRASS_FIND_VERSION} EQUAL GRASS_FIND_VERSION)
   ENDIF(GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION} AND EXISTS ${GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION}}/grass/version.h)
@@ -164,20 +158,13 @@ IF (WIN32)
 ENDIF (WIN32)
 
 IF (UNIX)
-  IF (GRASS_FIND_VERSION EQUAL 6)
-    LIST(APPEND GRASS_PATHS /usr/lib64/grass64 /usr/lib/grass64)
-  ELSEIF (GRASS_FIND_VERSION EQUAL 7)
+  IF (GRASS_FIND_VERSION EQUAL 7)
     LIST(APPEND GRASS_PATHS /usr/lib64/grass70 /usr/lib/grass70 /usr/lib64/grass71 /usr/lib/grass71 /usr/lib64/grass72 /usr/lib/grass72)
   ENDIF ()
 ENDIF (UNIX)
 
 IF (APPLE)
-  IF (GRASS_FIND_VERSION EQUAL 6)
-    LIST(APPEND GRASS_PATHS
-      /Applications/GRASS-6.3.app/Contents/MacOS
-      /Applications/GRASS-6.4.app/Contents/MacOS
-    )
-  ELSEIF (GRASS_FIND_VERSION EQUAL 7)
+  IF (GRASS_FIND_VERSION EQUAL 7)
     LIST(APPEND GRASS_PATHS
       /Applications/GRASS-7.0.app/Contents/MacOS
       /Applications/GRASS-7.1.app/Contents/MacOS
diff --git a/debian/rules b/debian/rules
index 95ae406ad06..d831ab74c73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,11 +85,6 @@ ifeq ($(GRASSVER),7)
 		-DWITH_GRASS=TRUE \
 		-DWITH_GRASS7=TRUE \
 		-DGRASS_PREFIX7=/usr/lib/$(GRASS)
-else
-	CMAKE_OPTS += \
-		-DWITH_GRASS=TRUE \
-		-DWITH_GRASS6=TRUE \
-		-DGRASS_PREFIX=/usr/lib/$(GRASS)
 endif
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
index b557c0f0fb4..8cbcdb71bbb 100644
--- a/ms-windows/osgeo4w/package-nightly.cmd
+++ b/ms-windows/osgeo4w/package-nightly.cmd
@@ -165,7 +165,6 @@ cmake -G Ninja ^
 	-D WITH_SERVER=TRUE ^
 	-D SERVER_SKIP_ECW=TRUE ^
 	-D WITH_GRASS=TRUE ^
-	-D WITH_GRASS6=FALSE ^
 	-D WITH_GRASS7=TRUE ^
 	-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
 	-D WITH_GLOBE=FALSE ^
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
index 5f86770a290..65173865b1f 100644
--- a/ms-windows/osgeo4w/package.cmd
+++ b/ms-windows/osgeo4w/package.cmd
@@ -158,7 +158,6 @@ cmake -G Ninja ^
 	-D WITH_SERVER=TRUE ^
 	-D SERVER_SKIP_ECW=TRUE ^
 	-D WITH_GRASS=TRUE ^
-	-D WITH_GRASS6=FALSE ^
 	-D WITH_GRASS7=TRUE ^
 	-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
 	-D WITH_GLOBE=FALSE ^
diff --git a/src/plugins/grass/modules/db.in.ogr.qgm b/src/plugins/grass/modules/db.in.ogr.qgm
index 9bbb042e1d2..1019cc377b4 100644
--- a/src/plugins/grass/modules/db.in.ogr.qgm
+++ b/src/plugins/grass/modules/db.in.ogr.qgm
@@ -2,7 +2,6 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import attribute tables in various formats" module="db.in.ogr">
-	<file key="dsn" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" version_max="6.4"/>
-	<file key="input" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" version_min="7.0"/>
+  <file key="input" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/db.out.ogr.qgm b/src/plugins/grass/modules/db.out.ogr.qgm
index ef1e5c744c0..2997faf0111 100644
--- a/src/plugins/grass/modules/db.out.ogr.qgm
+++ b/src/plugins/grass/modules/db.out.ogr.qgm
@@ -3,9 +3,7 @@
 
 <qgisgrassmodule label="Exports attribute tables into various format" module="db.out.ogr">
 	<option key="input" />
-	<file key="dsn" type="new" version_max="6"/>
-	<file key="output" type="new" version_min="7"/>
+  <file key="output" type="new"/>
 	<option key="format" />
-	<option key="db_table" version_max="6"/>
-	<option key="table" version_min="7"/>
+  <option key="table"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/db.select.qgm b/src/plugins/grass/modules/db.select.qgm
index c5127c92481..3c6e70c7232 100644
--- a/src/plugins/grass/modules/db.select.qgm
+++ b/src/plugins/grass/modules/db.select.qgm
@@ -6,6 +6,5 @@
 	<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" />
 	<option key="driver" />
 	<option key="sql" />
-	<option key="fs" answer="|" hidden="yes" version_max="6"/>
-	<option key="separator" answer="|" hidden="yes" version_min="7"/>
+  <option key="separator" answer="|" hidden="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/g.region.multiple.raster.qgm b/src/plugins/grass/modules/g.region.multiple.raster.qgm
index d437aea2a55..d752f9a49f8 100644
--- a/src/plugins/grass/modules/g.region.multiple.raster.qgm
+++ b/src/plugins/grass/modules/g.region.multiple.raster.qgm
@@ -2,6 +2,5 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Set the region to match multiple rasters" module="g.region">
-	<option key="rast" version_max="6.4"/>
-	<option key="raster" version_min="7.0"/>
+  <option key="raster"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/g.region.multiple.vector.qgm b/src/plugins/grass/modules/g.region.multiple.vector.qgm
index e037c30b8e7..964a8e179d7 100644
--- a/src/plugins/grass/modules/g.region.multiple.vector.qgm
+++ b/src/plugins/grass/modules/g.region.multiple.vector.qgm
@@ -2,6 +2,5 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Set the region to match multiple vectors" module="g.region">
-	<option key="vect" version_max="6.4"/>
-	<option key="vector" version_min="7.0"/>
+  <option key="vector"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.fft.qgm b/src/plugins/grass/modules/i.fft.qgm
index 57131fb9f85..450c91097f4 100644
--- a/src/plugins/grass/modules/i.fft.qgm
+++ b/src/plugins/grass/modules/i.fft.qgm
@@ -2,11 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Fast fourier transform for image processing" module="i.fft">
-	<option key="input_image" version_max="6"/>
-	<option key="input" version_min="7"/>
-	<option key="real_image" version_max="6"/>
-	<option key="real" version_min="7"/>
-	<option key="imaginary_image" version_max="6"/>
-	<option key="imaginary" version_min="7"/>
-	<option key="range" version_max="6"/>
+  <option key="input"/>
+  <option key="real"/>
+  <option key="imaginary"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.his.rgb.qgm b/src/plugins/grass/modules/i.his.rgb.qgm
index 5a5703a1f07..fe24abe296d 100644
--- a/src/plugins/grass/modules/i.his.rgb.qgm
+++ b/src/plugins/grass/modules/i.his.rgb.qgm
@@ -2,16 +2,10 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Hue Intensity Saturation (HIS) to Red Green Blue (RGB) raster color transform function" module="i.his.rgb">
-	<option key="hue_input" version_max="6"/>
-	<option key="hue" version_min="7"/>
-	<option key="intensity_input" version_max="6"/>
-	<option key="intensity" version_min="7"/>
-	<option key="saturation_input" version_max="6"/>
-	<option key="saturation" version_min="7"/>
-	<option key="red_output" version_max="6"/>
-	<option key="red" version_min="7"/>
-	<option key="green_output" version_max="6"/>
-	<option key="green" version_min="7"/>
-	<option key="blue_output" version_max="6"/>
-	<option key="blue" version_min="7"/>
+	<option key="hue"/>
+	<option key="intensity"/>
+	<option key="saturation"/>
+	<option key="red"/>
+	<option key="green"/>
+	<option key="blue"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.ifft.qgm b/src/plugins/grass/modules/i.ifft.qgm
index 35911789b73..6a5e1283c15 100644
--- a/src/plugins/grass/modules/i.ifft.qgm
+++ b/src/plugins/grass/modules/i.ifft.qgm
@@ -2,10 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Inverse fast fourier transform for image processing" module="i.ifft">
-	<option key="real_image" version_max="6"/>
-	<option key="real" version_min="7"/>
-	<option key="imaginary_image" version_max="6"/>
-	<option key="imaginary" version_min="7"/>
-	<option key="output_image" version_max="6"/>
-	<option key="output" version_min="7"/>
+	<option key="real"/>
+	<option key="imaginary"/>
+	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.image.mosaic.qgm b/src/plugins/grass/modules/i.image.mosaic.qgm
index b462c6e2149..b960711f246 100644
--- a/src/plugins/grass/modules/i.image.mosaic.qgm
+++ b/src/plugins/grass/modules/i.image.mosaic.qgm
@@ -2,10 +2,6 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Mosaic up to 4 images" module="i.image.mosaic">
-	<option key="image1" version_max="6"/>
-	<option key="image2" version_max="6"/>
-	<option key="image3" version_max="6"/>
-	<option key="image4" version_max="6"/>
-	<option key="input" version_min="7"/>
-	<option key="output" version_min="7"/>
+	<option key="input"/>
+	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.in.spotvgt.qgm b/src/plugins/grass/modules/i.in.spotvgt.qgm
index 0788edd11e5..22e205524b1 100644
--- a/src/plugins/grass/modules/i.in.spotvgt.qgm
+++ b/src/plugins/grass/modules/i.in.spotvgt.qgm
@@ -2,9 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import SPOT VGT NDVI" module="i.in.spotvgt">
-	<file key="file" type="new" version_max="6.4"/>
-	<file key="input" version_min="7.0"/>
+  <file key="input"/>
 	<flag key="a" />
-	<option key="rast" version_max="6.4"/>
-	<option key="output" version_min="7.0"/>
+  <option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.oif.qgm b/src/plugins/grass/modules/i.oif.qgm
index 0b0ca8108d6..8c3abb0a409 100644
--- a/src/plugins/grass/modules/i.oif.qgm
+++ b/src/plugins/grass/modules/i.oif.qgm
@@ -2,12 +2,6 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Calculate optimal index factor table for LANDSAT-TM raster" module="i.oif">
-	<option key="image1" version_max="6"/>
-	<option key="image2" version_max="6"/>
-	<option key="image3" version_max="6"/>
-	<option key="image4" version_max="6"/>
-	<option key="image5" version_max="6"/>
-	<option key="image7" version_max="6"/>
-	<option key="input" version_min="7"/>
-	<option key="output" version_min="7"/>
+	<option key="input"/>
+	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.rgb.his.qgm b/src/plugins/grass/modules/i.rgb.his.qgm
index ab57c35151a..8b1b497da72 100644
--- a/src/plugins/grass/modules/i.rgb.his.qgm
+++ b/src/plugins/grass/modules/i.rgb.his.qgm
@@ -2,16 +2,10 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Red Green Blue (RGB) to Hue Intensity Saturation (HIS) raster color transformation function" module="i.rgb.his">
-	<option key="red_input" version_max="6"/>
-	<option key="red" version_min="7"/>
-	<option key="green_input" version_max="6"/>
-	<option key="green" version_min="7"/>
-	<option key="blue_input" version_max="6"/>
-	<option key="blue" version_min="7"/>
-	<option key="hue_output" version_max="6"/>
-	<option key="hue" version_min="7"/>
-	<option key="intensity_output" version_max="6"/>
-	<option key="intensity" version_min="7"/>
-	<option key="saturation_output" version_max="6"/>
-	<option key="saturation" version_min="7"/>
+	<option key="red"/>
+	<option key="green"/>
+	<option key="blue"/>
+	<option key="hue"/>
+	<option key="intensity"/>
+	<option key="saturation"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.tasscap4.qgm b/src/plugins/grass/modules/i.tasscap4.qgm
index aa4937bb396..5b301f800a5 100644
--- a/src/plugins/grass/modules/i.tasscap4.qgm
+++ b/src/plugins/grass/modules/i.tasscap4.qgm
@@ -2,15 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 4 raster" module="i.tasscap">
-	<flag key="4" answer="on" hidden="yes" version_max="6"/>
-	<option key="band1" version_max="6"/>
-	<option key="band2" version_max="6"/>
-	<option key="band3" version_max="6"/>
-	<option key="band4" version_max="6"/>
-	<option key="band5" version_max="6"/>
-	<option key="band7" version_max="6"/>
-	<option key="outprefix" version_max="6"/>
-	<option key="input" label="Landsat 4 bands 1, 2, 3, 4, 5, 7" version_min="7"/>
-	<option key="output" version_min="7"/>
-	<option key="sensor" answer="landsat4_tm" hidden="yes" version_min="7"/>
+	<option key="input" label="Landsat 4 bands 1, 2, 3, 4, 5, 7"/>
+	<option key="output"/>
+	<option key="sensor" answer="landsat4_tm" hidden="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.tasscap5.qgm b/src/plugins/grass/modules/i.tasscap5.qgm
index 9cd3564dcfb..7e739ecd6b3 100644
--- a/src/plugins/grass/modules/i.tasscap5.qgm
+++ b/src/plugins/grass/modules/i.tasscap5.qgm
@@ -2,15 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 5 raster" module="i.tasscap">
-	<flag key="5" answer="on" hidden="yes" version_max="6"/>
-	<option key="band1" version_max="6"/>
-	<option key="band2" version_max="6"/>
-	<option key="band3" version_max="6"/>
-	<option key="band4" version_max="6"/>
-	<option key="band5" version_max="6"/>
-	<option key="band7" version_max="6"/>
-	<option key="outprefix" version_max="6"/>
-	<option key="input" label="Landsat 5 bands 1, 2, 3, 4, 5, 7" version_min="7"/>
-	<option key="output" version_min="7"/>
-	<option key="sensor" answer="landsat5_tm" hidden="yes" version_min="7"/>
+	<option key="input" label="Landsat 5 bands 1, 2, 3, 4, 5, 7"/>
+	<option key="output"/>
+	<option key="sensor" answer="landsat5_tm" hidden="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.tasscap7.qgm b/src/plugins/grass/modules/i.tasscap7.qgm
index a05f3f551c3..28ebbbefc1b 100644
--- a/src/plugins/grass/modules/i.tasscap7.qgm
+++ b/src/plugins/grass/modules/i.tasscap7.qgm
@@ -2,15 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Tasseled Cap (Kauth Thomas) transformation for LANDSAT-ETM 7 raster" module="i.tasscap">
-	<flag key="7" answer="on" hidden="yes" version_max="6"/>
-	<option key="band1" version_max="6"/>
-	<option key="band2" version_max="6"/>
-	<option key="band3" version_max="6"/>
-	<option key="band4" version_max="6"/>
-	<option key="band5" version_max="6"/>
-	<option key="band7" version_max="6"/>
-	<option key="outprefix" version_max="6"/>
-	<option key="input" label="Landsat 7 bands 1, 2, 3, 4, 5, 7" version_min="7"/>
-	<option key="output" version_min="7"/>
-	<option key="sensor" answer="landsat7_etm" hidden="yes" version_min="7"/>
+	<option key="input" label="Landsat 7 bands 1, 2, 3, 4, 5, 7"/>
+	<option key="output"/>
+	<option key="sensor" answer="landsat7_etm" hidden="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/m.cogo.qgm b/src/plugins/grass/modules/m.cogo.qgm
index 0ac15d48154..49b7b674aa0 100644
--- a/src/plugins/grass/modules/m.cogo.qgm
+++ b/src/plugins/grass/modules/m.cogo.qgm
@@ -3,8 +3,7 @@
 
 <qgisgrassmodule label="Convert bearing and distance measurements to coordinates and vice versa" module="m.cogo">
 	<file key="input" type="old" />
-	<option key="coord" version_max="6"/>
-	<option key="coordinates" version_min="7"/>
+	<option key="coordinates"/>
 	<flag key="r" />
 	<file key="output" type="new" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/m.proj.qgm b/src/plugins/grass/modules/m.proj.qgm
index 2242e556a8f..3eed77d8d12 100644
--- a/src/plugins/grass/modules/m.proj.qgm
+++ b/src/plugins/grass/modules/m.proj.qgm
@@ -5,12 +5,10 @@
 	<flag key="i" />
 	<flag key="o" />
 	<flag key="d" />
-	<flag key="v" version_max="6"/>
-	<option key="coordinates" version_min="7"/>
+	<option key="coordinates"/>
 	<file key="input" />
 	<file key="output" />
-	<option key="fs" version_max="6"/>
-	<option key="separator" version_min="7"/>
+	<option key="separator"/>
 	<option key="proj_in" />
 	<option key="proj_out" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.basins.fill.qgm b/src/plugins/grass/modules/r.basins.fill.qgm
index 1a520a175dc..51d4ea6395e 100644
--- a/src/plugins/grass/modules/r.basins.fill.qgm
+++ b/src/plugins/grass/modules/r.basins.fill.qgm
@@ -4,10 +4,7 @@
 <!-- direct note: the module runs, but it was not tested with real data -->
 <qgisgrassmodule label="Create watershed subbasins raster" module="r.basins.fill" direct="1">
 	<option key="number" />
-	<option key="c_map" version_max="6"/>
-	<option key="cnetwork" version_min="7"/>
-	<option key="t_map" version_max="6"/>
-	<option key="tnetwork" version_min="7"/>
-	<option key="result" version_max="6"/>
-	<option key="output" version_min="7"/>
+  <option key="cnetwork"/>
+	<option key="tnetwork"/>
+	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.carve.qgm b/src/plugins/grass/modules/r.carve.qgm
index 826b0eeb51b..323da7de1e2 100644
--- a/src/plugins/grass/modules/r.carve.qgm
+++ b/src/plugins/grass/modules/r.carve.qgm
@@ -2,10 +2,8 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Take vector stream data, transform it to raster, and subtract depth from the output DEM" module="r.carve">
-	<option key="rast" version_max="6"/>
-	<option key="raster" version_min="7"/>
-	<option key="vect" version_max="6"/>
-	<option key="vector" version_min="7"/>
+	<option key="raster"/>
+	<option key="vector"/>
 	<option key="width" />
 	<option key="depth" />
 	<flag key="n" />
diff --git a/src/plugins/grass/modules/r.circle.qgm b/src/plugins/grass/modules/r.circle.qgm
index 110e291e758..3b1098308b1 100644
--- a/src/plugins/grass/modules/r.circle.qgm
+++ b/src/plugins/grass/modules/r.circle.qgm
@@ -2,11 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Create a map containing concentric rings" module="r.circle">
-	<option key="coordinate" version_max="6"/>
-	<option key="coordinates" version_min="7"/>
+	<option key="coordinates"/>
 	<option key="min" answer="0" />
 	<option key="max" />
-	<option key="mult" answer="1" version_max="6"/>
-	<option key="multiplier" answer="1" version_min="7"/>
+	<option key="multiplier" answer="1"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.coin.qgm b/src/plugins/grass/modules/r.coin.qgm
index 254eac5aa1c..28bd8ba182c 100644
--- a/src/plugins/grass/modules/r.coin.qgm
+++ b/src/plugins/grass/modules/r.coin.qgm
@@ -2,9 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Tabulate mutual occurrence (coincidence) of categories for two rasters" module="r.coin">
-	<option key="map1" version_max="6"/>
-	<option key="first" version_min="7"/>
-	<option key="map2" version_max="6"/>
-	<option key="second" version_min="7"/>
+	<option key="first"/>
+	<option key="second"/>
 	<option key="units" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.colors.stddev.qgm b/src/plugins/grass/modules/r.colors.stddev.qgm
index b485f968ea9..f9c47a7de37 100644
--- a/src/plugins/grass/modules/r.colors.stddev.qgm
+++ b/src/plugins/grass/modules/r.colors.stddev.qgm
@@ -2,8 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Set color rules based on stddev from a map's mean value" module="r.colors.stddev">
-    <option key="input" version_max="6.4"/>
-    <option key="map" version_min="7.0"/>
+    <option key="map"/>
     <flag key="b" />
     <flag key="z" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.composite.qgm b/src/plugins/grass/modules/r.composite.qgm
index a3ba1fc7b5c..06bed3fa320 100644
--- a/src/plugins/grass/modules/r.composite.qgm
+++ b/src/plugins/grass/modules/r.composite.qgm
@@ -5,11 +5,8 @@
     <option key="red"/>
     <option key="green"/>
     <option key="blue"/>
-    <option key="lev_red" answer="32" hidden="no" label="(1-256)" version_max="6.4" />
-    <option key="lev_green" answer="32" hidden="no" label="(1-256)" version_max="6.4" />
-    <option key="lev_blue" answer="32" hidden="no" label="(1-256)" version_max="6.4" />
-    <option key="level_red" answer="32" hidden="no" label="(1-256)" version_min="7.0" />
-    <option key="level_green" answer="32" hidden="no" label="(1-256)" version_min="7.0" />
-    <option key="level_blue" answer="32" hidden="no" label="(1-256)" version_min="7.0" />
+    <option key="level_red" answer="32" hidden="no" label="(1-256)"/>
+    <option key="level_green" answer="32" hidden="no" label="(1-256)"/>
+    <option key="level_blue" answer="32" hidden="no" label="(1-256)"/>
     <option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.cost.coord.qgm b/src/plugins/grass/modules/r.cost.coord.qgm
index c6001d33a22..ab5abf3f101 100644
--- a/src/plugins/grass/modules/r.cost.coord.qgm
+++ b/src/plugins/grass/modules/r.cost.coord.qgm
@@ -3,12 +3,12 @@
 
 <qgisgrassmodule label="Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) coordinates" module="r.cost">
     <option key="input"/>
-    <option key="coordinate" version_max="6.4"/>
-    <option key="start_coordinates" version_min="7.0"/>
+
+    <option key="start_coordinates"/>
     <option key="output"/>
     <option key="max_cost" hidden="no"/>
-    <option key="stop_coordinate" hidden="no" advanced="yes" version_max="6.4"/>
-    <option key="stop_coordinates" hidden="no" advanced="yes" version_min="7.0"/>
+
+    <option key="stop_coordinates" hidden="no" advanced="yes"/>
 <!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
     <option key="null_cost" hidden="no" advanced="yes"/>
     <flag key="k" hidden="no" />
diff --git a/src/plugins/grass/modules/r.cost.rast.qgm b/src/plugins/grass/modules/r.cost.rast.qgm
index 0225a86bc28..26cd9fd64ac 100644
--- a/src/plugins/grass/modules/r.cost.rast.qgm
+++ b/src/plugins/grass/modules/r.cost.rast.qgm
@@ -3,12 +3,12 @@
 
 <qgisgrassmodule label="Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) raster" module="r.cost">
     <option key="input"/>
-    <option key="start_rast" version_max="6.4"/>
-    <option key="start_raster" version_min="7.0"/>
+
+    <option key="start_raster"/>
     <option key="output"/>
     <option key="max_cost" hidden="no"/>
-    <option key="stop_coordinate" hidden="no" advanced="yes" version_max="6.4"/>
-    <option key="stop_coordinates" hidden="no" advanced="yes" version_min="7.0"/>
+
+    <option key="stop_coordinates" hidden="no" advanced="yes"/>
 <!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
     <option key="null_cost" hidden="no" advanced="yes"/>
     <flag key="k" hidden="no" />
diff --git a/src/plugins/grass/modules/r.cost.vect.qgm b/src/plugins/grass/modules/r.cost.vect.qgm
index 185100741db..0bef66688bf 100644
--- a/src/plugins/grass/modules/r.cost.vect.qgm
+++ b/src/plugins/grass/modules/r.cost.vect.qgm
@@ -6,8 +6,8 @@
     <option key="start_points"/>
     <option key="output"/>
     <option key="max_cost" hidden="no"/>
-    <option key="stop_coordinate" hidden="no" advanced="yes" version_max="6.4"/>
-    <option key="stop_coordinates" hidden="no" advanced="yes" version_min="7.0"/>
+
+    <option key="stop_coordinates" hidden="no" advanced="yes"/>
 <!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
     <option key="null_cost" hidden="no" advanced="yes"/>
     <flag key="k" hidden="no" />
diff --git a/src/plugins/grass/modules/r.describe.qgm b/src/plugins/grass/modules/r.describe.qgm
index 4709a164f5f..ca92fc2322d 100644
--- a/src/plugins/grass/modules/r.describe.qgm
+++ b/src/plugins/grass/modules/r.describe.qgm
@@ -7,9 +7,9 @@
 	<flag key="n" />
 	<flag key="d" />
 	<flag key="i" />
-	<flag key="q" version_max="6"/>
+
 	<option key="map" />
-	<option key="nv" version_max="6"/>
-	<option key="null_value" version_min="7"/>
+
+	<option key="null_value"/>
 	<option key="nsteps" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.distance.qgm b/src/plugins/grass/modules/r.distance.qgm
index 3615eab5862..4d3ecb168f4 100644
--- a/src/plugins/grass/modules/r.distance.qgm
+++ b/src/plugins/grass/modules/r.distance.qgm
@@ -2,12 +2,12 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Locate the closest points between objects in two raster maps" module="r.distance">
-	<option key="maps" option="map1" version_max="6"/>
-	<option key="map" option="map1" version_min="7"/>
-	<option key="maps" option="map2" version_max="6"/>
-	<option key="map" option="map2" version_min="7"/>
-		<option key="fs" advanced="yes" version_max="6"/>
-		<option key="separator" advanced="yes" version_min="7"/>
-		<option key="sort" advanced="yes" version_min="7"/>
+
+	<option key="map" option="map1"/>
+
+	<option key="map" option="map2"/>
+
+		<option key="separator" advanced="yes"/>
+		<option key="sort" advanced="yes"/>
 </qgisgrassmodule>
 
diff --git a/src/plugins/grass/modules/r.drain.qgm b/src/plugins/grass/modules/r.drain.qgm
index 4d3a0d08c6f..a1bd9119d09 100644
--- a/src/plugins/grass/modules/r.drain.qgm
+++ b/src/plugins/grass/modules/r.drain.qgm
@@ -4,6 +4,6 @@
 <qgisgrassmodule label="Trace a flow through an elevation model" module="r.drain">
     <option key="input"/>
     <option key="output"/>
-    <option key="coordinate" version_max="6.4"/>
-    <option key="start_coordinates" version_min="7.0"/>
+
+    <option key="start_coordinates"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.fill.dir.qgm b/src/plugins/grass/modules/r.fill.dir.qgm
index 8e78c7c23ba..45392ebd68b 100644
--- a/src/plugins/grass/modules/r.fill.dir.qgm
+++ b/src/plugins/grass/modules/r.fill.dir.qgm
@@ -3,9 +3,9 @@
 
 <qgisgrassmodule label="Filter and create depressionless elevation map and flow direction map from elevation raster" module="r.fill.dir">
 	<option key="input" />
-	<option key="type" answer="grass" hidden="yes" version_max="6"/>
-	<option key="format" answer="grass" hidden="yes" version_min="7"/>
-	<option key="elevation" version_max="6"/>
-	<option key="output" version_min="7"/>
+
+	<option key="format" answer="grass" hidden="yes"/>
+
+	<option key="output"/>
 	<option key="direction" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.his.qgm b/src/plugins/grass/modules/r.his.qgm
index 90e7e7bdf9b..7c199239301 100644
--- a/src/plugins/grass/modules/r.his.qgm
+++ b/src/plugins/grass/modules/r.his.qgm
@@ -2,16 +2,16 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Create red, green and blue rasters combining hue, intensity, and saturation (his) values from rasters" module="r.his">
-    <option key="h_map" version_max="6.4"/>
-    <option key="i_map" version_max="6.4"/>
-    <option key="s_map" version_max="6.4"/>
-    <option key="r_map" version_max="6.4"/>
-    <option key="g_map" version_max="6.4"/>
-    <option key="b_map" version_max="6.4"/>
-    <option key="hue" version_min="7.0" />
-    <option key="intensity" version_min="7.0" />
-    <option key="saturation" version_min="7.0" />
-    <option key="red" version_min="7.0" />
-    <option key="green" version_min="7.0" />
-    <option key="blue" version_min="7.0" />
+
+
+
+
+
+
+    <option key="hue" />
+    <option key="intensity" />
+    <option key="saturation" />
+    <option key="red" />
+    <option key="green" />
+    <option key="blue" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.in.ascii.qgm b/src/plugins/grass/modules/r.in.ascii.qgm
index 3b9b94c3a10..3d871d77610 100644
--- a/src/plugins/grass/modules/r.in.ascii.qgm
+++ b/src/plugins/grass/modules/r.in.ascii.qgm
@@ -3,14 +3,14 @@
 
 <qgisgrassmodule label="Import ASCII raster" module="r.in.ascii">
 	<file key="input" type="old" />
-	<option key="mult" version_max="6.4" />
-	<option key="multiplier" version_min="7.0" />
-	<option key="nv" version_max="6.4" />
-	<option key="null_value" version_min="7.0" />
-	<option key="type" version_min="7.0" />
-	<flag key="i" version_max="6.4" />
-	<flag key="f" version_max="6.4" />
-	<flag key="d" version_max="6.4" />
+
+	<option key="multiplier" />
+
+	<option key="null_value" />
+	<option key="type" />
+
+
+
 	<flag key="s" />
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.in.wms.qgm b/src/plugins/grass/modules/r.in.wms.qgm
index 22be6f81e65..979de873918 100644
--- a/src/plugins/grass/modules/r.in.wms.qgm
+++ b/src/plugins/grass/modules/r.in.wms.qgm
@@ -2,29 +2,29 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Download and import data from WMS server" module="r.in.wms">
-	<option key="mapserver" version_max="6.4"/>
-	<option key="url" version_min="7.0"/>
+
+	<option key="url"/>
 	<option key="layers" />
 	<option key="srs" />
 	<option key="format" />
-	<option key="wms_version" version_min="7.0"/>
-	<option key="wmsquery" version_max="6.4"/>
-	<flag key="d" answer="off" version_max="6.4"/>
+	<option key="wms_version"/>
+
+
 	<flag key="c" answer="off" />
-	<option key="folder" version_max="6.4"/>
-	<option key="wgetoptions" version_max="6.4"/>
-	<option key="curloptions" version_max="6.4"/>
-	<flag key="k" answer="off" version_max="6.4"/>
+
+
+
+
 	<flag key="o" answer="off"/>
-	<flag key="p" answer="off" version_max="6.4"/>
+
 	<option key="method" />
 	<option key="output" />
-	<option key="maxcols" advanced="yes" version_min="7.0"/>
-	<option key="maxrows" advanced="yes" version_min="7.0"/>
-	<option key="username" advanced="yes" version_min="7.0"/>
-	<option key="password" advanced="yes" version_min="7.0"/>
-	<option key="method" advanced="yes" version_min="7.0"/>
-	<option key="region" advanced="yes" version_min="7.0"/>
-	<option key="bgcolor" advanced="yes" version_min="7.0"/>
-	<option key="urlparams" advanced="yes" version_min="7.0"/>
+	<option key="maxcols" advanced="yes"/>
+	<option key="maxrows" advanced="yes"/>
+	<option key="username" advanced="yes"/>
+	<option key="password" advanced="yes"/>
+	<option key="method" advanced="yes"/>
+	<option key="region" advanced="yes"/>
+	<option key="bgcolor" advanced="yes"/>
+	<option key="urlparams" advanced="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.in.xyz.qgm b/src/plugins/grass/modules/r.in.xyz.qgm
index e5e0e8b9eed..87e80e7959f 100644
--- a/src/plugins/grass/modules/r.in.xyz.qgm
+++ b/src/plugins/grass/modules/r.in.xyz.qgm
@@ -5,8 +5,8 @@
 	<file key="input" type="old" filters="TXT (*.txt);;CSV (*.csv)"/>
 	<option key="method" />
 	<option key="type" />
-	<option key="fs" version_max="6.4" />
-	<option key="separator" version_min="7.0" />
+
+	<option key="separator" />
 	<option key="x" />
 	<option key="y" />
 	<option key="z" />
diff --git a/src/plugins/grass/modules/r.info.qgm b/src/plugins/grass/modules/r.info.qgm
index 26874abd003..578088b6e69 100644
--- a/src/plugins/grass/modules/r.info.qgm
+++ b/src/plugins/grass/modules/r.info.qgm
@@ -4,5 +4,5 @@
 <qgisgrassmodule label="Outputs basic information about a raster map" module="r.info">
 	<option key="map"/>
 	<flag key="h"/>
-	<flag key="e" version_min="7"/>
+	<flag key="e"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.lake.seed.qgm b/src/plugins/grass/modules/r.lake.seed.qgm
index 474d2ee1f7c..113d218def9 100644
--- a/src/plugins/grass/modules/r.lake.seed.qgm
+++ b/src/plugins/grass/modules/r.lake.seed.qgm
@@ -2,10 +2,10 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Fill lake from seed at given level" module="r.lake">
-	<option key="dem" version_max="6"/>
-	<option key="elevation" version_min="7"/>
+
+	<option key="elevation"/>
 	<option key="seed" />
-	<option key="wl" version_max="6"/>
-	<option key="water_level" version_min="7"/>
+
+	<option key="water_level"/>
 	<option key="lake" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.lake.xy.qgm b/src/plugins/grass/modules/r.lake.xy.qgm
index c0659c40084..438603fc3f5 100644
--- a/src/plugins/grass/modules/r.lake.xy.qgm
+++ b/src/plugins/grass/modules/r.lake.xy.qgm
@@ -2,12 +2,12 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Fill lake from seed point at given level" module="r.lake">
-	<option key="dem" version_max="6"/>
-	<option key="elevation" version_min="7"/>
-	<option key="xy" version_max="6"/>
-	<option key="coordinates" version_min="7"/>
-	<option key="wl" version_max="6"/>
-	<option key="water_level" version_min="7"/>
+
+	<option key="elevation"/>
+
+	<option key="coordinates"/>
+
+	<option key="water_level"/>
 	<flag key="n" />
 	<flag key="o" />
 	<option key="lake" />
diff --git a/src/plugins/grass/modules/r.out.ascii.qgm b/src/plugins/grass/modules/r.out.ascii.qgm
index 5721574f87c..4a8acda00b7 100644
--- a/src/plugins/grass/modules/r.out.ascii.qgm
+++ b/src/plugins/grass/modules/r.out.ascii.qgm
@@ -3,10 +3,10 @@
 
 <qgisgrassmodule label="Export raster to ASCII text file" module="r.out.ascii">
 	<option key="input" />
-	<option key="dp" answer="2" version_max="6.4"/>
-	<option key="precision" answer="2" version_min="7.0"/>
-	<option key="null" version_max="6.4"/>
-	<option key="null_value" version_min="7.0"/>
+
+	<option key="precision" answer="2"/>
+
+	<option key="null_value"/>
 	<file key="output" type="new" />
 	<flag key="h" />
 	<flag key="s" />
diff --git a/src/plugins/grass/modules/r.out.mpeg.qgm b/src/plugins/grass/modules/r.out.mpeg.qgm
index 961bc50705f..a67eb4dbb1c 100644
--- a/src/plugins/grass/modules/r.out.mpeg.qgm
+++ b/src/plugins/grass/modules/r.out.mpeg.qgm
@@ -3,8 +3,8 @@
 
 <qgisgrassmodule label="Export raster series to MPEG movie" module="r.out.mpeg">
 	<file key="view1" label="Type in map names separated by a comma" />
-	<option key="qual" version_max="6.4"/>
-	<option key="quality" version_min="7.0"/>
+
+	<option key="quality"/>
 	<flag key="c" />
 	<file key="output" type="new" filters="MPEG (*.mpg)" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.out.pov.qgm b/src/plugins/grass/modules/r.out.pov.qgm
index 63f7e9a71c5..8db10d86874 100644
--- a/src/plugins/grass/modules/r.out.pov.qgm
+++ b/src/plugins/grass/modules/r.out.pov.qgm
@@ -2,11 +2,11 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Export raster to POVRAY height-field file" module="r.out.pov">
-	<option key="map" version_max="6.4"/>
-	<option key="input" version_min="7.0"/>
+
+	<option key="input"/>
 	<option key="hftype" />
 	<option key="bias" />
 	<option key="scale" />
-	<file key="tga" type="new" version_max="6.4"/>
-	<file key="output" type="new" version_min="7.0"/>
+
+	<file key="output" type="new"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.out.ppm.qgm b/src/plugins/grass/modules/r.out.ppm.qgm
index 9ff44741e6b..a3b2a27f682 100644
--- a/src/plugins/grass/modules/r.out.ppm.qgm
+++ b/src/plugins/grass/modules/r.out.ppm.qgm
@@ -3,7 +3,7 @@
 
 <qgisgrassmodule label="Export raster to PPM image at the resolution of the current region" module="r.out.ppm">
 	<option key="input" />
-	<flag key="G" version_max="6.4"/>
-	<flag key="g" version_min="7.0"/>
+
+	<flag key="g"/>
 	<file key="output" type="new" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.out.vrml.qgm b/src/plugins/grass/modules/r.out.vrml.qgm
index d7be3f43e30..c12b6498163 100644
--- a/src/plugins/grass/modules/r.out.vrml.qgm
+++ b/src/plugins/grass/modules/r.out.vrml.qgm
@@ -2,10 +2,10 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Export raster to Virtual Reality Modeling Language (VRML)" module="r.out.vrml">
-	<option key="elev" version_max="6.4"/>
-	<option key="elevation" version_min="7.0"/>
+
+	<option key="elevation"/>
 	<option key="color" />
-	<option key="exag" version_max="6.4"/>
-	<option key="exaggeration" version_min="7.0"/>
+
+	<option key="exaggeration"/>
 	<file key="output" type="new" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.out.vtk.qgm b/src/plugins/grass/modules/r.out.vtk.qgm
index 1baf17e77af..c3edb72d675 100644
--- a/src/plugins/grass/modules/r.out.vtk.qgm
+++ b/src/plugins/grass/modules/r.out.vtk.qgm
@@ -6,11 +6,11 @@
 	<option key="elevation" />
 	<flag key="p" answer="off" />
 	<option key="null" />
-	<option key="elevation2d" version_max="6.4"/>
-	<option key="elevscale" version_max="6.4"/>
-	<option key="dp" version_max="6.4"/>
-	<option key="z" version_min="7.0"/>
-	<option key="zscale" version_min="7.0"/>
-	<option key="precision" version_min="7.0"/>
+
+
+
+	<option key="z"/>
+	<option key="zscale"/>
+	<option key="precision"/>
 	<file key="output" type="new" filters="VTK (*.vtk *.VTK);;All files (*.*)" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.out.xyz.qgm b/src/plugins/grass/modules/r.out.xyz.qgm
index 622d4f6de59..c996a04e265 100644
--- a/src/plugins/grass/modules/r.out.xyz.qgm
+++ b/src/plugins/grass/modules/r.out.xyz.qgm
@@ -3,7 +3,7 @@
 
 <qgisgrassmodule label="Export raster to text file as x,y,z values based on cell centers" module="r.out.xyz">
 	<option key="input" />
-	<option key="fs" version_max="6.4"/>
-	<option key="separator" version_min="7.0"/>
+
+	<option key="separator"/>
 	<file key="output" type="new" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.param.scale.qgm b/src/plugins/grass/modules/r.param.scale.qgm
index f8487349ef3..7be95031448 100644
--- a/src/plugins/grass/modules/r.param.scale.qgm
+++ b/src/plugins/grass/modules/r.param.scale.qgm
@@ -3,8 +3,8 @@
 
 <qgisgrassmodule label="Extracts terrain parameters from DEM" module="r.param.scale">
     <option key="input"/>
-    <option key="param" version_max="6.4"/>
-    <option key="method" version_min="7.0"/>
+
+    <option key="method"/>
     <option key="size" answer="3" hidden="no"/>
     <option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.plane.qgm b/src/plugins/grass/modules/r.plane.qgm
index 0d76b2199c2..e666225a707 100644
--- a/src/plugins/grass/modules/r.plane.qgm
+++ b/src/plugins/grass/modules/r.plane.qgm
@@ -7,6 +7,6 @@
 	<option key="easting" />
 	<option key="northing" />
 	<option key="elevation" />
-	<option key="name" version_max="6"/>
-	<option key="output" version_min="7"/>
+
+	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.random.qgm b/src/plugins/grass/modules/r.random.qgm
index aef7c5f4df3..bd26b8c54cb 100644
--- a/src/plugins/grass/modules/r.random.qgm
+++ b/src/plugins/grass/modules/r.random.qgm
@@ -3,8 +3,8 @@
 
 <qgisgrassmodule label="Create random vector point contained in raster" module="r.random">
 	<option key="input"/>
-	<option key="n" answer="1" hidden="no" version_max="6"/>
-	<option key="npoints" answer="1" hidden="no" version_min="7"/>
-	<option key="vector_output" version_max="6"/>
-	<option key="vector" version_min="7"/>
+
+	<option key="npoints" answer="1" hidden="no"/>
+
+	<option key="vector"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.random.raster.qgm b/src/plugins/grass/modules/r.random.raster.qgm
index cb7f8c962e8..178ea595fcf 100644
--- a/src/plugins/grass/modules/r.random.raster.qgm
+++ b/src/plugins/grass/modules/r.random.raster.qgm
@@ -3,8 +3,8 @@
 
 <qgisgrassmodule label="Create random raster" module="r.random" direct="1">
 	<option key="input"/>
-	<option key="n" answer="1" hidden="no" version_max="6"/>
-	<option key="npoints" answer="1" hidden="no" version_min="7"/>
-	<option key="raster_output" version_max="6"/>
-	<option key="raster" version_min="7"/>
+
+	<option key="npoints" answer="1" hidden="no"/>
+
+	<option key="raster"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.reclass.area.greater.qgm b/src/plugins/grass/modules/r.reclass.area.greater.qgm
index 3a58c884de1..fc550dc4937 100644
--- a/src/plugins/grass/modules/r.reclass.area.greater.qgm
+++ b/src/plugins/grass/modules/r.reclass.area.greater.qgm
@@ -3,8 +3,8 @@
 
 <qgisgrassmodule label="Reclass raster with patches larger than user-defined area size (in hectares)" module="r.reclass.area">
 	<option key="input" />
-	<option key="greater" version_max="6"/>
-	<option key="mode" answer="greater" hidden="yes" version_min="7"/>
-	<option key="value" version_min="7"/>
+
+	<option key="mode" answer="greater" hidden="yes"/>
+	<option key="value"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.reclass.area.lesser.qgm b/src/plugins/grass/modules/r.reclass.area.lesser.qgm
index 93001b0c297..db74f0ebd54 100644
--- a/src/plugins/grass/modules/r.reclass.area.lesser.qgm
+++ b/src/plugins/grass/modules/r.reclass.area.lesser.qgm
@@ -3,8 +3,8 @@
 
 <qgisgrassmodule label="Reclass raster with patches smaller than user-defined area size (in hectares)" module="r.reclass.area">
 	<option key="input" />
-	<option key="lesser" version_max="6"/>
-	<option key="mode" answer="lesser" hidden="yes" version_min="7"/>
-	<option key="value" version_min="7"/>
+
+	<option key="mode" answer="lesser" hidden="yes"/>
+	<option key="value"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.regression.line.qgm b/src/plugins/grass/modules/r.regression.line.qgm
index 2703608b0fd..1b59227138f 100644
--- a/src/plugins/grass/modules/r.regression.line.qgm
+++ b/src/plugins/grass/modules/r.regression.line.qgm
@@ -2,8 +2,8 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Calculate linear regression from two rasters: y = a + b*x" module="r.regression.line">
-	<option key="map1" version_max="6"/>
-	<option key="mapx" version_min="7"/>
-	<option key="map2" version_max="6"/>
-	<option key="mapy" version_min="7"/>
+
+	<option key="mapx"/>
+
+	<option key="mapy"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.resamp.rst.qgm b/src/plugins/grass/modules/r.resamp.rst.qgm
index db6dac7c394..db669e9d7b8 100644
--- a/src/plugins/grass/modules/r.resamp.rst.qgm
+++ b/src/plugins/grass/modules/r.resamp.rst.qgm
@@ -5,7 +5,7 @@
 	<option key="input" />
 	<option key="ew_res" />
 	<option key="ns_res" />
-	<option key="elev" version_max="6.4"/>
-	<option key="elevation" version_min="7.0"/>
+
+	<option key="elevation"/>
 	<flag key="t" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.stats.qgm b/src/plugins/grass/modules/r.stats.qgm
index dea19aee2fc..da84bdb0705 100644
--- a/src/plugins/grass/modules/r.stats.qgm
+++ b/src/plugins/grass/modules/r.stats.qgm
@@ -16,10 +16,10 @@
         <flag key="C" advanced="yes"/>
         <flag key="r" advanced="yes"/>
         <flag key="i" advanced="yes"/>
-        <option key="fs" advanced="yes" version_max="6.4"/>
-        <option key="separator" advanced="yes" version_min="7.0"/>
-        <option key="nv" advanced="yes" version_max="6.4"/>
-        <option key="null_value" advanced="yes" version_min="7.0"/>
+
+        <option key="separator" advanced="yes"/>
+
+        <option key="null_value" advanced="yes"/>
         <option key="nsteps" advanced="yes"/>
 	<file key="output" type="new"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.surf.area.qgm b/src/plugins/grass/modules/r.surf.area.qgm
index a6d6116a443..c8635a001bb 100644
--- a/src/plugins/grass/modules/r.surf.area.qgm
+++ b/src/plugins/grass/modules/r.surf.area.qgm
@@ -2,8 +2,8 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Calculate raster surface area" module="r.surf.area">
-	<option key="input" version_max="6"/>
-	<option key="map" version_min="7"/>
+
+	<option key="map"/>
 	<option key="vscale" />
-	<option key="units" version_min="7"/>
+	<option key="units"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.surf.fractal.qgm b/src/plugins/grass/modules/r.surf.fractal.qgm
index 6d9a726a602..6153743488b 100644
--- a/src/plugins/grass/modules/r.surf.fractal.qgm
+++ b/src/plugins/grass/modules/r.surf.fractal.qgm
@@ -2,10 +2,10 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Create fractal surface of given fractal dimension" module="r.surf.fractal">
-	<option key="d" version_max="6.3" />
-	<option key="dimension" version_min="6.4" />
-	<option key="n" version_max="6.3" />
-	<option key="number" version_min="6.4" />
-	<option key="out" version_max="6.3" />
-	<option key="output" version_min="6.4" />
+^.*version_max="6.3".*$
+	<option key="dimension" />
+^.*version_max="6.3".*$
+	<option key="number" />
+^.*version_max="6.3".*$
+	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.texture.bis.qgm b/src/plugins/grass/modules/r.texture.bis.qgm
index 58767b9f460..fbbb07121f4 100644
--- a/src/plugins/grass/modules/r.texture.bis.qgm
+++ b/src/plugins/grass/modules/r.texture.bis.qgm
@@ -5,14 +5,14 @@
     <option key="input" />
     <option key="size" answer="3" />
     <option key="distance" answer="1" />
-    <flag key="x" version_max="6.4"/>
-    <flag key="e" version_max="6.4"/>
-    <flag key="d" version_max="6.4"/>
-    <flag key="p" version_max="6.4"/>
-    <flag key="m" version_max="6.4"/>
-    <flag key="n" version_max="6.4"/>
-    <flag key="o" version_max="6.4"/>
-    <option key="method" version_min="7.0"/>
-    <option key="prefix" version_max="6.4"/>
-    <option key="output" version_min="7.0"/>
+
+
+
+
+
+
+
+    <option key="method"/>
+
+    <option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.texture.qgm b/src/plugins/grass/modules/r.texture.qgm
index 389aa8a463f..7e918cba507 100644
--- a/src/plugins/grass/modules/r.texture.qgm
+++ b/src/plugins/grass/modules/r.texture.qgm
@@ -5,14 +5,14 @@
     <option key="input" />
     <option key="size" />
     <option key="distance" />
-    <flag key="a" version_max="6.4"/>
-    <flag key="c" version_max="6.4"/>
-    <flag key="k" version_max="6.4"/>
-    <flag key="v" version_max="6.4"/>
-    <flag key="i" version_max="6.4"/>
-    <flag key="s" version_max="6.4"/>
-    <flag key="w" version_max="6.4"/>
-    <option key="method" version_min="7.0"/>
-    <option key="prefix" version_max="6.4"/>
-    <option key="output" version_min="7.0"/>
+
+
+
+
+
+
+
+    <option key="method"/>
+
+    <option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.to.vect.area.qgm b/src/plugins/grass/modules/r.to.vect.area.qgm
index 6a56661a98b..94a3e049670 100644
--- a/src/plugins/grass/modules/r.to.vect.area.qgm
+++ b/src/plugins/grass/modules/r.to.vect.area.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Convert raster to vector areas" module="r.to.vect">
 	<option key="input" />
 	<option key="output" />
-	<option key="feature" answer="area" hidden="yes" version_max="6.4"/>
-	<option key="type" answer="area" hidden="yes" version_min="7.0"/>
+
+	<option key="type" answer="area" hidden="yes"/>
 	<flag key="s" answer="on" hidden="yes" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.to.vect.line.qgm b/src/plugins/grass/modules/r.to.vect.line.qgm
index e4b1ada0715..6e7d38fd03f 100644
--- a/src/plugins/grass/modules/r.to.vect.line.qgm
+++ b/src/plugins/grass/modules/r.to.vect.line.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Convert raster to vector lines" module="r.to.vect">
 	<option key="input" />
 	<option key="output" />
-	<option key="feature" answer="line" hidden="yes" version_max="6.4"/>
-	<option key="type" answer="line" hidden="yes" version_min="7.0"/>
+
+	<option key="type" answer="line" hidden="yes"/>
 	<flag key="s" answer="on" hidden="yes" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.to.vect.point.qgm b/src/plugins/grass/modules/r.to.vect.point.qgm
index cbc7e7291be..90a7ee78b06 100644
--- a/src/plugins/grass/modules/r.to.vect.point.qgm
+++ b/src/plugins/grass/modules/r.to.vect.point.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Convert raster to vector points" module="r.to.vect">
 	<option key="input" />
 	<option key="output" />
-	<option key="feature" answer="point" hidden="yes" version_max="6.4"/>
-	<option key="type" answer="point" hidden="yes" version_min="7.0"/>
+
+	<option key="type" answer="point" hidden="yes"/>
 	<flag key="s" answer="on" hidden="yes" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.volume.qgm b/src/plugins/grass/modules/r.volume.qgm
index 3e3a1bca69d..0a8af6b8e5a 100644
--- a/src/plugins/grass/modules/r.volume.qgm
+++ b/src/plugins/grass/modules/r.volume.qgm
@@ -3,8 +3,8 @@
 
 <qgisgrassmodule label="Calculate volume of data clumps, and create vector with centroids of clumps" module="r.volume">
 	<flag key="f" />
-	<option key="data" version_max="6"/>
-	<option key="input" version_min="7"/>
+
+	<option key="input"/>
 	<option key="clump" />
 	<option key="centroids" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.walk.coord.qgm b/src/plugins/grass/modules/r.walk.coord.qgm
index 1edac2088aa..98515030a52 100644
--- a/src/plugins/grass/modules/r.walk.coord.qgm
+++ b/src/plugins/grass/modules/r.walk.coord.qgm
@@ -4,12 +4,12 @@
 <qgisgrassmodule label="Generate raster of cumulative cost of moving between locations, based on elevation and friction input rasters and starting point(s) coordinates" module="r.walk">
     <option key="elevation"/>
     <option key="friction"/>
-    <option key="coordinate" version_max="6.4"/>
-    <option key="start_coordinates" version_min="7.0"/>
+
+    <option key="start_coordinates"/>
     <option key="output"/>
     <flag key="k" hidden="no"/>
-        <option key="stop_coordinate" advanced="yes" version_max="6.4"/>
-        <option key="stop_coordinates" advanced="yes" version_min="7.0"/>
+
+        <option key="stop_coordinates" advanced="yes"/>
 <!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
     <option key="max_cost" advanced="yes"/>
     <option key="lambda" advanced="yes"/>
diff --git a/src/plugins/grass/modules/r.walk.vect.qgm b/src/plugins/grass/modules/r.walk.vect.qgm
index 0650b735d50..8af813189f2 100644
--- a/src/plugins/grass/modules/r.walk.vect.qgm
+++ b/src/plugins/grass/modules/r.walk.vect.qgm
@@ -6,8 +6,8 @@
     <option key="friction"/>
     <option key="start_points"/>
     <option key="output"/>
-        <option key="stop_coordinate" advanced="yes" version_max="6.4"/>
-        <option key="stop_coordinates" advanced="yes" version_min="7.0"/>
+
+        <option key="stop_coordinates" advanced="yes"/>
 <!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
     <option key="max_cost" advanced="yes"/>
     <option key="lambda" advanced="yes"/>
diff --git a/src/plugins/grass/modules/r.water.outlet.qgm b/src/plugins/grass/modules/r.water.outlet.qgm
index 3a326521a40..36e7cfba323 100644
--- a/src/plugins/grass/modules/r.water.outlet.qgm
+++ b/src/plugins/grass/modules/r.water.outlet.qgm
@@ -2,11 +2,11 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Create watershed basin" module="r.water.outlet">
-	<option key="drainage" version_max="6"/>
-	<option key="input" version_min="7"/>
-	<option key="easting" version_max="6"/>
-	<option key="northing" version_max="6"/>
-	<option key="coordinates" version_min="7"/>
-	<option key="basin" version_max="6"/>
-	<option key="output" version_min="7"/>
+
+	<option key="input"/>
+
+
+	<option key="coordinates"/>
+
+	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.what.coordinates.qgm b/src/plugins/grass/modules/r.what.coordinates.qgm
index 1a23e4d16b8..cbbe0e7910f 100644
--- a/src/plugins/grass/modules/r.what.coordinates.qgm
+++ b/src/plugins/grass/modules/r.what.coordinates.qgm
@@ -6,14 +6,14 @@
 	<flag key="f" />
 	<flag key="c" />
 	<flag key="i" />
-	<option key="input" version_max="6.4"/>
-	<option key="map" version_min="7.0"/>
-	<option key="east_north" version_max="6.4" />
-	<option key="coordinates" version_min="7.0" />
-	<file key="output" type="new" version_min="7.0" />
+
+	<option key="map"/>
+
+	<option key="coordinates" />
+	<file key="output" type="new" />
 	<option key="cache" advanced="yes"/>
-	<option key="null" advanced="yes" version_max="6.4" />
-	<option key="null_value" advanced="yes" version_min="7.0" />
-	<option key="fs" advanced="yes" version_max="6.4" />
-	<option key="separator" advanced="yes" version_min="7.0" />
+
+	<option key="null_value" advanced="yes" />
+
+	<option key="separator" advanced="yes" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.buffer.qgm b/src/plugins/grass/modules/v.buffer.qgm
index d5dd3a5aaaa..fcfd01356c5 100644
--- a/src/plugins/grass/modules/v.buffer.qgm
+++ b/src/plugins/grass/modules/v.buffer.qgm
@@ -3,7 +3,7 @@
 
 <qgisgrassmodule label="Vector buffer" module="v.buffer">
 	<option key="input" typeoption="type" layeroption="layer" />
-	<option key="buffer" version_max="6.3"/>
-	<option key="distance" version_min="6.4"/>
+^.*version_max="6.3".*$
+	<option key="distance"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.clean.chdangles.qgm b/src/plugins/grass/modules/v.clean.chdangles.qgm
index 7ad32b5735a..ec5c2bd2997 100644
--- a/src/plugins/grass/modules/v.clean.chdangles.qgm
+++ b/src/plugins/grass/modules/v.clean.chdangles.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Change the type of boundary dangle to line" module="v.clean">
 	<option key="input" typemask="area"/>
 	<option key="tool" answer="chdangle" hidden="yes"/>
-	<option key="thresh" version_max="6"/>
-	<option key="threshold" version_min="7"/>
+
+	<option key="threshold"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.clean.prune.qgm b/src/plugins/grass/modules/v.clean.prune.qgm
index f2a35ed1c76..3c6acfa2291 100644
--- a/src/plugins/grass/modules/v.clean.prune.qgm
+++ b/src/plugins/grass/modules/v.clean.prune.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Remove vertices in threshold from lines and boundaries, boundary is pruned only if topology is not damaged (new intersection, changed attachment of centroid), first and last segment of the boundary is never changed" module="v.clean">
 	<option key="input" typeoption="type"/>
 	<option key="tool" answer="prune" hidden="yes"/>
-	<option key="thresh" version_max="6"/>
-	<option key="threshold" version_min="7"/>
+
+	<option key="threshold"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.clean.rmarea.qgm b/src/plugins/grass/modules/v.clean.rmarea.qgm
index 1b835e457b2..2a5d716efca 100644
--- a/src/plugins/grass/modules/v.clean.rmarea.qgm
+++ b/src/plugins/grass/modules/v.clean.rmarea.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Remove small areas, the longest boundary with adjacent area is removed" module="v.clean">
 	<option key="input" typeoption="type"/>
 	<option key="tool" answer="rmarea" hidden="yes"/>
-	<option key="thresh" version_max="6"/>
-	<option key="threshold" version_min="7"/>
+
+	<option key="threshold"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.clean.rmdangles.qgm b/src/plugins/grass/modules/v.clean.rmdangles.qgm
index b47cfffb6c4..4c9ae49fc40 100644
--- a/src/plugins/grass/modules/v.clean.rmdangles.qgm
+++ b/src/plugins/grass/modules/v.clean.rmdangles.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Remove dangles" module="v.clean">
 	<option key="input" typeoption="type"/>
 	<option key="tool" answer="rmdangle" hidden="yes"/>
-	<option key="thresh" version_max="6"/>
-	<option key="threshold" version_min="7"/>
+
+	<option key="threshold"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.clean.snap.qgm b/src/plugins/grass/modules/v.clean.snap.qgm
index f4251cbf087..453e6224d93 100644
--- a/src/plugins/grass/modules/v.clean.snap.qgm
+++ b/src/plugins/grass/modules/v.clean.snap.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Snap lines to vertex in threshold" module="v.clean">
 	<option key="input" typeoption="type"/>
 	<option key="tool" answer="snap" hidden="yes"/>
-	<option key="thresh" version_max="6"/>
-	<option key="threshold" version_min="7"/>
+
+	<option key="threshold"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.join.qgm b/src/plugins/grass/modules/v.db.join.qgm
index 7f80216dcbe..ca32358c452 100644
--- a/src/plugins/grass/modules/v.db.join.qgm
+++ b/src/plugins/grass/modules/v.db.join.qgm
@@ -4,8 +4,8 @@
 <qgisgrassmodule label="Join table to existing vector table" module="v.db.join">
 	<option key="map" layeroption="layer" />
 	<field key="column" layer="map" type="integer,string" label="Attribute field" />
-	<option key="otable" version_max="6"/>
-	<option key="other_table" version_min="7"/>
-	<field key="ocolumn" label="Attribute field to join" version_max="6"/>
-	<field key="other_column" label="Attribute field to join" version_min="7"/>
+
+	<option key="other_table"/>
+
+	<field key="other_column" label="Attribute field to join"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.select.qgm b/src/plugins/grass/modules/v.db.select.qgm
index b737e8dc4eb..a1f14f96256 100644
--- a/src/plugins/grass/modules/v.db.select.qgm
+++ b/src/plugins/grass/modules/v.db.select.qgm
@@ -3,8 +3,8 @@
 
 <qgisgrassmodule label="Display vector attributes" module="v.db.select">
 	<option key="map" layeroption="layer" />
-	<field key="column" layer="map" type="integer,double,varchar" version_max="6.3"/>
-	<field key="columns" layer="map" type="integer,double,varchar" version_min="6.4"/>
-	<option key="fs" answer="|" hidden="yes" version_max="6"/>
-	<option key="separator" answer="|" hidden="yes" version_min="7"/>
+^.*version_max="6.3".*$
+	<field key="columns" layer="map" type="integer,double,varchar"/>
+
+	<option key="separator" answer="|" hidden="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.select.where.qgm b/src/plugins/grass/modules/v.db.select.where.qgm
index 796dc013fb8..ac48d35c40e 100644
--- a/src/plugins/grass/modules/v.db.select.where.qgm
+++ b/src/plugins/grass/modules/v.db.select.where.qgm
@@ -3,9 +3,9 @@
 
 <qgisgrassmodule label="Display vector map attributes with SQL" module="v.db.select">
 	<option key="map" layeroption="layer" />
-	<field key="column" layer="map" type="integer,double,varchar" version_max="6.3"/>
-	<field key="columns" layer="map" type="integer,double,varchar" version_min="6.4"/>
+^.*version_max="6.3".*$
+	<field key="columns" layer="map" type="integer,double,varchar"/>
 	<option key="where" />
-	<option key="fs" answer="|" hidden="yes" version_max="6"/>
-	<option key="separator" answer="|" hidden="yes" version_min="7"/>
+
+	<option key="separator" answer="|" hidden="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.univar.qgm b/src/plugins/grass/modules/v.db.univar.qgm
index 74aca67e06c..a0b4fe0f7b7 100644
--- a/src/plugins/grass/modules/v.db.univar.qgm
+++ b/src/plugins/grass/modules/v.db.univar.qgm
@@ -2,9 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Calculate univariate statistics for numeric attributes in a data table" module="v.db.univar">
-	<option key="table" version_max="6"/>
-	<option key="map" version_min="7"/>
-	<field key="column" layer="table" type="integer,double" label="Attribute field" version_max="6"/>
-	<field key="column" layer="map" type="integer,double" label="Attribute field" version_min="7"/>
+
+	<option key="map"/>
+
+	<field key="column" layer="map" type="integer,double" label="Attribute field"/>
 	<flag key="e" answer="no"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.update_op.qgm b/src/plugins/grass/modules/v.db.update_op.qgm
index 60807bd0ff5..66b63dec2c2 100644
--- a/src/plugins/grass/modules/v.db.update_op.qgm
+++ b/src/plugins/grass/modules/v.db.update_op.qgm
@@ -4,6 +4,6 @@
 <qgisgrassmodule label="Assign new value as result of operation on columns to column in attribute table" module="v.db.update">
 	<option key="map" layeroption="layer" />
 	<field key="column" layer="map" type="integer,double,varchar,string" label="Attribute field" />
-	<field key="qcolumn" version_max="6"/>
-	<field key="query_column" version_min="7"/>
+
+	<field key="query_column"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.update_op_query.qgm b/src/plugins/grass/modules/v.db.update_op_query.qgm
index baeb1fa0e5f..2632d0bc29d 100644
--- a/src/plugins/grass/modules/v.db.update_op_query.qgm
+++ b/src/plugins/grass/modules/v.db.update_op_query.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Assign new value to column as result of operation on columns only if the result of query is TRUE" module="v.db.update">
 	<option key="map" layeroption="layer" />
 	<field key="column" layer="map" type="integer,double,varchar,string" label="Attribute field" />
-	<field key="qcolumn" version_max="6"/>
-	<field key="query_column" version_min="7"/>
+
+	<field key="query_column"/>
 	<option key="where"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.drape.qgm b/src/plugins/grass/modules/v.drape.qgm
index 887a12fd0bd..52d108afcf9 100644
--- a/src/plugins/grass/modules/v.drape.qgm
+++ b/src/plugins/grass/modules/v.drape.qgm
@@ -3,8 +3,8 @@
 
 <qgisgrassmodule label="Convert 2D vector to 3D vector by sampling of elevation raster. Default sampling by nearest neighbour" module="v.drape">
     <option key="input" />
-	<option key="rast" version_max="6"/>
-	<option key="elevation" version_min="7"/>
+
+	<option key="elevation"/>
 	<option key="method" />
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.extract.list.qgm b/src/plugins/grass/modules/v.extract.list.qgm
index 31e2925f634..a0531d730bd 100644
--- a/src/plugins/grass/modules/v.extract.list.qgm
+++ b/src/plugins/grass/modules/v.extract.list.qgm
@@ -3,7 +3,7 @@
 
 <qgisgrassmodule label="Extract selected features" module="v.extract">
 	<option key="input" typeoption="type" layeroption="layer" id="input"/>
-	<selection key="list" layerid="input" label="Cats" version_max="6"/>
-	<selection key="cats" layerid="input" label="Cats" version_min="7"/>
+
+	<selection key="cats" layerid="input" label="Cats"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.extrude.attr.qgm b/src/plugins/grass/modules/v.extrude.attr.qgm
index 03d2e27560e..6b6fcfbdf98 100644
--- a/src/plugins/grass/modules/v.extrude.attr.qgm
+++ b/src/plugins/grass/modules/v.extrude.attr.qgm
@@ -6,7 +6,7 @@
 	<option key="elevation" label="Elevation raster for height extraction (optional)"/>
     <flag key="t" answer="on" advanced="yes" />
 	<option key="zshift" advanced="yes" />
-    <field key="hcolumn" layer="input" type="integer,double" version_max="6"/>
-    <field key="height_column" layer="input" type="integer,double" version_min="7"/>
+
+    <field key="height_column" layer="input" type="integer,double"/>
     <option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.generalize.qgm b/src/plugins/grass/modules/v.generalize.qgm
index 2ca8d85a04a..08d7402adbc 100644
--- a/src/plugins/grass/modules/v.generalize.qgm
+++ b/src/plugins/grass/modules/v.generalize.qgm
@@ -3,7 +3,7 @@
 
 <qgisgrassmodule label="Simplify vector" module="v.generalize">
 	<option key="input" typeoption="type" layeroption="layer" />
-        <flag key="c" answer="on" hidden="yes" version_max="6"/>
+
 	<option key="type" label="Feature type (for polygons, choose Boundary)"/>
 	<option key="method" />
 	<option key="threshold" answer="1.0" label="Maximal tolerance value (higher value=more simplification)" />
diff --git a/src/plugins/grass/modules/v.hull.qgm b/src/plugins/grass/modules/v.hull.qgm
index b82a9c41352..07f73aabd6a 100644
--- a/src/plugins/grass/modules/v.hull.qgm
+++ b/src/plugins/grass/modules/v.hull.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Convex hull" module="v.hull">
 	<option key="input"/>
 	<option key="output"/>
-	<flag key="a" answer="on" version_max="6"/>
-	<flag key="r" answer="off" version_min="7"/>
+
+	<flag key="r" answer="off"/>
 	<flag key="f" answer="on"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.in.ascii.qgm b/src/plugins/grass/modules/v.in.ascii.qgm
index 2a493138df4..4613882e955 100644
--- a/src/plugins/grass/modules/v.in.ascii.qgm
+++ b/src/plugins/grass/modules/v.in.ascii.qgm
@@ -5,8 +5,8 @@
 	<file key="input" label="Text file"/>
 	<option key="output"/>
 	<option key="format"/>
-        <option key="fs" label="Separator (| , \t etc.)" version_max="6.4" />
-        <option key="separator" label="Separator (| , \t etc.)" version_min="7.0" />
+
+        <option key="separator" label="Separator (| , \t etc.)" />
 	<option key="skip" label="Number of rows to be skipped"/>
 	<option key="x" label="Which column for the X coordinate? The first is 1"/>
         <option key="y" label="Which column for the Y coordinate?"/>
diff --git a/src/plugins/grass/modules/v.in.e00.qgm b/src/plugins/grass/modules/v.in.e00.qgm
index e057e8741cb..ff31561e9ae 100644
--- a/src/plugins/grass/modules/v.in.e00.qgm
+++ b/src/plugins/grass/modules/v.in.e00.qgm
@@ -2,9 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import ESRI E00 vector" module="v.in.e00">
-	<file key="file" type="old" label="E00 vector layer" version_max="6.4"/>
-	<file key="input" type="old" label="E00 vector layer" version_min="7.0"/>
+
+	<file key="input" type="old" label="E00 vector layer"/>
 	<option key="type" />
-	<option key="vect" version_max="6.4"/>
-	<option key="output" version_min="7.0"/>
+
+	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.in.ogr.all.loc.qgm b/src/plugins/grass/modules/v.in.ogr.all.loc.qgm
index 2cf93610d45..ed125477e1e 100644
--- a/src/plugins/grass/modules/v.in.ogr.all.loc.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.all.loc.qgm
@@ -2,13 +2,13 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import all OGR/PostGIS vectors in a given data source and create a fitted location" module="v.in.ogr">
-	<file key="dsn" type="directory" label="Path to the OGR data source" version_max="6.4"/>
-	<file key="input" type="directory" label="Path to the OGR data source" version_min="7.0"/>
+
+	<file key="input" type="directory" label="Path to the OGR data source"/>
 	<option key="output" />
 	<option key="location" />
         <option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
-        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
+
+        <flag key="2" answer="off" hidden="no" advanced="yes"/>
         <flag key="t" answer="off" hidden="no" advanced="yes"/>
         <flag key="o" answer="off" hidden="no" advanced="yes"/>
         <flag key="r" answer="off" hidden="no" advanced="yes"/>
diff --git a/src/plugins/grass/modules/v.in.ogr.all.qgm b/src/plugins/grass/modules/v.in.ogr.all.qgm
index c6edbb0bbdc..614d60e6c52 100644
--- a/src/plugins/grass/modules/v.in.ogr.all.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.all.qgm
@@ -2,12 +2,12 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import OGR vectors in a given data source combining them in a GRASS vector" module="v.in.ogr">
-	<file key="dsn" type="directory" label="Path to the OGR data source" version_max="6.4"/>
-	<file key="input" type="directory" label="Path to the OGR data source" version_min="7.0"/>
+
+	<file key="input" type="directory" label="Path to the OGR data source"/>
 	<option key="output" />
         <option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
-        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
+
+        <flag key="2" answer="off" hidden="no" advanced="yes"/>
         <flag key="t" answer="off" hidden="no" advanced="yes"/>
         <flag key="o" answer="off" hidden="no" advanced="yes"/>
         <flag key="r" answer="off" hidden="no" advanced="yes"/>
diff --git a/src/plugins/grass/modules/v.in.ogr.loc.qgm b/src/plugins/grass/modules/v.in.ogr.loc.qgm
index c757f6ce28c..b06ce6996ef 100644
--- a/src/plugins/grass/modules/v.in.ogr.loc.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.loc.qgm
@@ -2,13 +2,13 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import OGR vector and create a fitted location" module="v.in.ogr">
-	<file key="dsn" version_max="6"/>
-	<file key="input" version_min="7"/>
+
+	<file key="input"/>
 	<option key="output" />
 	<option key="location" />
         <option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6"/>
-        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7"/>
+
+        <flag key="2" answer="off" hidden="no" advanced="yes"/>
         <flag key="t" answer="off" hidden="no" advanced="yes"/>
         <flag key="o" answer="off" hidden="no" advanced="yes"/>
         <flag key="r" answer="off" hidden="no" advanced="yes"/>
diff --git a/src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm b/src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
index 79e119ee57d..cdb7f4a17ad 100644
--- a/src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
@@ -2,13 +2,13 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import loaded vector and create a fitted location" module="v.in.ogr"> 
-	<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" version_max="6.4"/>
-	<ogr key="input" layeroption="layer" whereoption="where" label="Loaded layer" version_min="7.0"/>
+
+	<ogr key="input" layeroption="layer" whereoption="where" label="Loaded layer"/>
 	<option key="output" />	
 	<option key="location" />
         <option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
-        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
+
+        <flag key="2" answer="off" hidden="no" advanced="yes"/>
         <flag key="t" answer="off" hidden="no" advanced="yes"/>
         <flag key="o" answer="off" hidden="no" advanced="yes"/>
         <flag key="r" answer="off" hidden="no" advanced="yes"/>
diff --git a/src/plugins/grass/modules/v.in.ogr.qgis.qgm b/src/plugins/grass/modules/v.in.ogr.qgis.qgm
index 62873a15774..371cb9ebf7d 100644
--- a/src/plugins/grass/modules/v.in.ogr.qgis.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.qgis.qgm
@@ -2,12 +2,12 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import loaded vector" module="v.in.ogr">
-        <ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" version_max="6.4"/>
-		<ogr key="input" layeroption="layer" whereoption="where" label="Loaded layer" version_min="7.0"/>
+
+		<ogr key="input" layeroption="layer" whereoption="where" label="Loaded layer"/>
         <option key="output" />
         <option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
-        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
+
+        <flag key="2" answer="off" hidden="no" advanced="yes"/>
         <flag key="t" answer="off" hidden="no" advanced="yes"/>
         <flag key="o" answer="off" hidden="no" advanced="yes"/>
         <flag key="r" answer="off" hidden="no" advanced="yes"/>
diff --git a/src/plugins/grass/modules/v.in.ogr.qgm b/src/plugins/grass/modules/v.in.ogr.qgm
index 2ec21538bb0..80d60a234cd 100644
--- a/src/plugins/grass/modules/v.in.ogr.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.qgm
@@ -2,12 +2,12 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import OGR vector" module="v.in.ogr">
-	<file key="dsn" version_max="6.4"/>
-	<file key="input" version_min="7.0"/>
+
+	<file key="input"/>
 	<option key="output" />	
         <option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
-        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
+
+        <flag key="2" answer="off" hidden="no" advanced="yes"/>
         <flag key="t" answer="off" hidden="no" advanced="yes"/>
         <flag key="o" answer="off" hidden="no" advanced="yes"/>
         <flag key="r" answer="off" hidden="no" advanced="yes"/>
diff --git a/src/plugins/grass/modules/v.info.qgm b/src/plugins/grass/modules/v.info.qgm
index 6120d733ba0..8b4a2df9d07 100644
--- a/src/plugins/grass/modules/v.info.qgm
+++ b/src/plugins/grass/modules/v.info.qgm
@@ -5,7 +5,7 @@
 	<option key="map"/>
 	<flag key="h"/>
 	<flag key="c"/>
-	<flag key="e" version_min="7"/>
+	<flag key="e"/>
 	<flag key="t"/>
 	<flag key="g"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.kcv.qgm b/src/plugins/grass/modules/v.kcv.qgm
index cee0985edf9..241fc54c39f 100644
--- a/src/plugins/grass/modules/v.kcv.qgm
+++ b/src/plugins/grass/modules/v.kcv.qgm
@@ -2,10 +2,10 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Randomly partition points into test/train sets" module="v.kcv">
-	<option key="input" version_max="6"/>
-	<option key="map" version_min="7"/>
-	<option key="k" version_max="6"/>
-	<option key="npartitions" version_min="7"/>
+
+	<option key="map"/>
+
+	<option key="npartitions"/>
 	<option key="column" answer="part" hidden="yes"/>
-	<option key="output" version_max="6"/>
+
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.kernel.qgm b/src/plugins/grass/modules/v.kernel.qgm
index 104cb3bf3d3..03aabd5dc14 100644
--- a/src/plugins/grass/modules/v.kernel.qgm
+++ b/src/plugins/grass/modules/v.kernel.qgm
@@ -3,10 +3,10 @@
 
 <qgisgrassmodule label="Gaussian kernel density" module="v.kernel"  manual="v.kernel">
 	<option key="input" />
-	<option key="stddeviation" version_max="6"/>
-	<option key="radius" version_min="7"/>
-	<option key="mult" answer="1" advanced="yes" version_max="6"/>
-	<option key="multiplier" answer="1" advanced="yes" version_min="7"/>
+
+	<option key="radius"/>
+
+	<option key="multiplier" answer="1" advanced="yes"/>
 	<option key="kernel" answer="gaussian" advanced="yes"/>
 	<option key="output" outputType="raster"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.net.alloc.qgm b/src/plugins/grass/modules/v.net.alloc.qgm
index db4359f38d1..c6a90e220f7 100644
--- a/src/plugins/grass/modules/v.net.alloc.qgm
+++ b/src/plugins/grass/modules/v.net.alloc.qgm
@@ -2,11 +2,11 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Allocate network" module="v.net.alloc">
-	<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" version_max="6"/>
-	<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs" version_min="7"/>
-	<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" version_max="6"/>
-	<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes" version_min="7"/>
-	<selection key="ccats" layerid="nodes" label="Cats" version_max="6"/>
-	<selection key="center_cats" layerid="nodes" label="Cats" version_min="7"/>
+
+	<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs"/>
+
+	<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes"/>
+
+	<selection key="center_cats" layerid="nodes" label="Cats"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.net.iso.qgm b/src/plugins/grass/modules/v.net.iso.qgm
index fc96f278c0f..dd71996c3ea 100644
--- a/src/plugins/grass/modules/v.net.iso.qgm
+++ b/src/plugins/grass/modules/v.net.iso.qgm
@@ -2,12 +2,12 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Cut network by cost isolines" module="v.net.iso">
-	<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" version_max="6"/>
-	<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs" version_min="7"/>
-	<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" version_max="6"/>
-	<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes" version_min="7"/>
-	<selection key="ccats" layerid="nodes" label="Cats (select from the map or using their id)" version_max="6"/>
-	<selection key="center_cats" layerid="nodes" label="Cats (select from the map or using their id)" version_min="7"/>
+
+	<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs"/>
+
+	<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes"/>
+
+	<selection key="center_cats" layerid="nodes" label="Cats (select from the map or using their id)"/>
 	<option key="costs" />
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.net.nodes.qgm b/src/plugins/grass/modules/v.net.nodes.qgm
index 1534eea223b..fd262cf523e 100644
--- a/src/plugins/grass/modules/v.net.nodes.qgm
+++ b/src/plugins/grass/modules/v.net.nodes.qgm
@@ -2,10 +2,10 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Create nodes on network" module="v.net">
-	<option key="input" layeroption="alayer" typemask="line,boundary" version_max="6"/>
-	<option key="input" layeroption="arc_layer" typemask="line,boundary" version_min="7"/>
-	<option key="nlayer" version_max="6"/>
-	<option key="node_layer" version_min="7"/>
+
+	<option key="input" layeroption="arc_layer" typemask="line,boundary"/>
+
+	<option key="node_layer"/>
 	<option key="operation" answer="nodes" hidden="yes" />
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.net.path.qgm b/src/plugins/grass/modules/v.net.path.qgm
index 60f5133c519..75063d366ff 100644
--- a/src/plugins/grass/modules/v.net.path.qgm
+++ b/src/plugins/grass/modules/v.net.path.qgm
@@ -3,17 +3,17 @@
 
 <qgisgrassmodule label="Find shortest path on vector network" module="v.net.path">
 	<option key="input" />
-	<option key="alayer" answer="1" version_max="6"/>
-	<option key="arc_layer" answer="1" version_min="7"/>
-	<option key="nlayer" answer="2" version_max="6"/>
-	<option key="node_layer" answer="2" version_min="7"/>
+
+	<option key="arc_layer" answer="1"/>
+
+	<option key="node_layer" answer="2"/>
 	<file key="file" type="old" />
-	<option key="afcolumn" version_max="6"/>
-	<option key="arc_column" version_min="7"/>
-	<option key="abcolumn" version_max="6"/>
-	<option key="arc_backward_column" version_min="7"/>
-	<option key="ncolumn" version_max="6"/>
-	<option key="node_column" version_min="7"/>
+
+	<option key="arc_column"/>
+
+	<option key="arc_backward_column"/>
+
+	<option key="node_column"/>
 	<option key="dmax" />
 	<flag key="g" />
 	<flag key="s" />
diff --git a/src/plugins/grass/modules/v.net.qgm b/src/plugins/grass/modules/v.net.qgm
index 6fcf8975cdc..b74e80e78a0 100644
--- a/src/plugins/grass/modules/v.net.qgm
+++ b/src/plugins/grass/modules/v.net.qgm
@@ -5,13 +5,13 @@
 	<option key="input" />
 	<option key="points" />
 	<option key="operation" />
-	<option key="alayer" answer="1" version_max="6"/>
-	<option key="arc_layer" answer="1" version_min="7"/>
-	<option key="nlayer" answer="2" version_max="6"/>
-	<option key="node_layer" answer="2" version_min="7"/>
-	<option key="thresh" version_max="6"/>
-	<option key="threshold" version_min="7"/>
+
+	<option key="arc_layer" answer="1"/>
+
+	<option key="node_layer" answer="2"/>
+
+	<option key="threshold"/>
 	<flag key="c" />
-	<flag key="s" version_min="7"/>
+	<flag key="s"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.net.salesman.qgm b/src/plugins/grass/modules/v.net.salesman.qgm
index 151e4c7817f..d7ddd135815 100644
--- a/src/plugins/grass/modules/v.net.salesman.qgm
+++ b/src/plugins/grass/modules/v.net.salesman.qgm
@@ -2,11 +2,11 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Connect nodes by shortest route (traveling salesman)" module="v.net.salesman">
-	<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" version_max="6"/>
-	<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs" version_min="7"/>
-	<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" version_max="6"/>
-	<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes" version_min="7"/>
-	<selection key="ccats" layerid="nodes" label="Cats" version_max="6"/>
-	<selection key="center_cats" layerid="nodes" label="Cats" version_min="7"/>
+
+	<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs"/>
+
+	<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes"/>
+
+	<selection key="center_cats" layerid="nodes" label="Cats"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.net.steiner.qgm b/src/plugins/grass/modules/v.net.steiner.qgm
index 33e6c5f54d0..c91d498228d 100644
--- a/src/plugins/grass/modules/v.net.steiner.qgm
+++ b/src/plugins/grass/modules/v.net.steiner.qgm
@@ -2,11 +2,11 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Connect selected nodes by shortest tree (Steiner tree)" module="v.net.steiner">
-	<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" version_max="6"/>
-	<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs" version_min="7"/>
-	<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" version_max="6"/>
-	<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes" version_min="7"/>
-	<selection key="tcats" layerid="nodes" label="Cats" version_max="6"/>
-	<selection key="terminal_cats" layerid="nodes" label="Cats" version_min="7"/>
+
+	<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs"/>
+
+	<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes"/>
+
+	<selection key="terminal_cats" layerid="nodes" label="Cats"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.net.visibility.qgm b/src/plugins/grass/modules/v.net.visibility.qgm
index 4eed8f206ff..949bb860fec 100644
--- a/src/plugins/grass/modules/v.net.visibility.qgm
+++ b/src/plugins/grass/modules/v.net.visibility.qgm
@@ -3,9 +3,9 @@
 
 <qgisgrassmodule label="Visibility graph construction" module="v.net.visibility">
 	<option key="input" />
-	<option key="coordinate" version_max="6"/>
-	<option key="coordinates" version_min="7"/>
-	<option key="vis" version_max="6"/>
-	<option key="visibility" version_min="7"/>
+
+	<option key="coordinates"/>
+
+	<option key="visibility"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.out.ascii.qgm b/src/plugins/grass/modules/v.out.ascii.qgm
index 0786ce9dabb..e1ad4b8c667 100644
--- a/src/plugins/grass/modules/v.out.ascii.qgm
+++ b/src/plugins/grass/modules/v.out.ascii.qgm
@@ -5,6 +5,6 @@
 	<option key="input" />
 	<option key="format"/>
 	<file key="output" type="new" />
-	<option key="fs" advanced="yes" version_max="6.4"/>
-	<option key="separator" advanced="yes" version_min="7.0"/>
+
+	<option key="separator" advanced="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.out.ogr.gml.qgm b/src/plugins/grass/modules/v.out.ogr.gml.qgm
index 23d842655c3..84eb43118cc 100644
--- a/src/plugins/grass/modules/v.out.ogr.gml.qgm
+++ b/src/plugins/grass/modules/v.out.ogr.gml.qgm
@@ -4,8 +4,8 @@
 <qgisgrassmodule label="Export vector to GML" module="v.out.ogr">
 	<option key="input" layeroption="layer" typeoption="type" />
 	<option key="format" answer="GML" hidden="yes" />
-	<file key="dsn" type="new" label="Output GML file" filters="GML (*.gml)" version_max="6.4"/>
-	<file key="output" type="new" label="Output GML file" filters="GML (*.gml)" version_min="7.0"/>
-	<option key="olayer" answer="default" label="Output layer name (used in GML file)" version_max="6.4"/>
-	<option key="output_layer" answer="default" label="Output layer name (used in GML file)" version_min="7.0"/>
+
+	<file key="output" type="new" label="Output GML file" filters="GML (*.gml)"/>
+
+	<option key="output_layer" answer="default" label="Output layer name (used in GML file)"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.out.ogr.mapinfo.qgm b/src/plugins/grass/modules/v.out.ogr.mapinfo.qgm
index fbf603311d0..e98a626cfd1 100644
--- a/src/plugins/grass/modules/v.out.ogr.mapinfo.qgm
+++ b/src/plugins/grass/modules/v.out.ogr.mapinfo.qgm
@@ -4,6 +4,6 @@
 <qgisgrassmodule label="Export vector to Mapinfo" module="v.out.ogr">
 	<option key="input" layeroption="layer" typeoption="type" />
 	<option key="format" answer="MapInfo_File" hidden="yes" />
-	<file key="dsn" type="new" fileoption="olayer" label="Output Shapefile" filters="MapInfo (*.tab)" version_max="6.4"/>
-	<file key="output" type="new" fileoption="olayer" label="Output Shapefile" filters="MapInfo (*.tab)" version_min="7.0"/>
+
+	<file key="output" type="new" fileoption="olayer" label="Output Shapefile" filters="MapInfo (*.tab)"/>
 </qgisgrassmodule>
\ No newline at end of file
diff --git a/src/plugins/grass/modules/v.out.ogr.qgm b/src/plugins/grass/modules/v.out.ogr.qgm
index 9e2c925e462..331a9b56e3e 100644
--- a/src/plugins/grass/modules/v.out.ogr.qgm
+++ b/src/plugins/grass/modules/v.out.ogr.qgm
@@ -4,10 +4,10 @@
 <qgisgrassmodule label="Export vector to various formats (OGR library)" module="v.out.ogr">
 	<option key="input" layeroption="layer" typeoption="type" />
 	<option key="format"/>
-	<file key="dsn" type="new" label="Name for new vector file (specify file extension)" version_max="6.4"/>
-	<file key="output" type="new" label="Name for new vector file (specify file extension)" version_min="7.0"/>
-	<option key="olayer" answer="default" hidden="yes" version_max="6.4"/>
-	<option key="output_layer" answer="default" hidden="yes" version_min="7.0"/>
+
+	<file key="output" type="new" label="Name for new vector file (specify file extension)"/>
+
+	<option key="output_layer" answer="default" hidden="yes"/>
 	<flag key="e" answer="on" hidden="yes" />
 	<flag key="c" answer="on" hidden="no" label="Write only features link to a record"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.out.vtk.qgm b/src/plugins/grass/modules/v.out.vtk.qgm
index c5a9f853d50..a657e563031 100644
--- a/src/plugins/grass/modules/v.out.vtk.qgm
+++ b/src/plugins/grass/modules/v.out.vtk.qgm
@@ -3,7 +3,7 @@
 
 <qgisgrassmodule label="Export vector to VTK-ASCII" module="v.out.vtk">
 	<option key="input" layeroption="layer" typeoption="type" />
-	<option key="scale" version_max="6.4"/>
-	<option key="zscale" version_min="7.0"/>
+
+	<option key="zscale"/>
 	<file key="output" type="new" filters="VTK (*.vtk *.VTK);;All files (*.*)"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.outlier.qgm b/src/plugins/grass/modules/v.outlier.qgm
index ab027b1a817..7bb5222f544 100644
--- a/src/plugins/grass/modules/v.outlier.qgm
+++ b/src/plugins/grass/modules/v.outlier.qgm
@@ -3,15 +3,15 @@
 
 <qgisgrassmodule label="Remove outliers from vector point data" module="v.outlier">
 	<option key="input" />
-	<option key="soe" ansewr="10" version_max="6"/>
-	<option key="ew_step" ansewr="10" version_min="7"/>
-	<option key="son" ansewr="10" version_max="6"/>
-	<option key="ns_step" ansewr="10" version_min="7"/>
-	<option key="lambda_i" ansewr="0.1" version_max="6"/>
-	<option key="lambda" ansewr="0.1" version_min="7"/>
-	<option key="thres_o" ansewr="50" version_max="6"/>
-	<option key="threshold" ansewr="50" version_min="7"/>
+
+	<option key="ew_step" ansewr="10"/>
+
+	<option key="ns_step" ansewr="10"/>
+
+	<option key="lambda" ansewr="0.1"/>
+
+	<option key="threshold" ansewr="50"/>
 	<option key="output" />
 	<option key="outlier" />
-		<option key="filter" ansewr="both" advanced="yes" version_min="7"/>
+		<option key="filter" ansewr="both" advanced="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.random.3d.qgm b/src/plugins/grass/modules/v.random.3d.qgm
index 920793aed5a..265e890cd1a 100644
--- a/src/plugins/grass/modules/v.random.3d.qgm
+++ b/src/plugins/grass/modules/v.random.3d.qgm
@@ -3,10 +3,10 @@
 
 <qgisgrassmodule label="Create random 3D vector points" module="v.random">
 	<flag key="z" answer="yes" hidden="yes"/>
-	<option key="n" version_max="6"/>
-	<option key="npoints" version_min="7"/>
+
+	<option key="npoints"/>
     <option key="column" answer="zvalue" hidden="yes"/>
-        <option key="column_type" advanced="yes" version_min="7"/>
+        <option key="column_type" advanced="yes"/>
 		<option key="zmin" advanced="yes"/>
 		<option key="zmax" advanced="yes"/>
 	<option key="output" />
diff --git a/src/plugins/grass/modules/v.random.qgm b/src/plugins/grass/modules/v.random.qgm
index b5ad79763b9..58df1bf4dc9 100644
--- a/src/plugins/grass/modules/v.random.qgm
+++ b/src/plugins/grass/modules/v.random.qgm
@@ -2,7 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Create random 2D vector points" module="v.random">
-	<option key="n" version_max="6"/>
-	<option key="npoints" version_min="7"/>
+
+	<option key="npoints"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.rast.stats.qgm b/src/plugins/grass/modules/v.rast.stats.qgm
index cf87e124137..87907313b2f 100644
--- a/src/plugins/grass/modules/v.rast.stats.qgm
+++ b/src/plugins/grass/modules/v.rast.stats.qgm
@@ -3,9 +3,9 @@
 
 <qgisgrassmodule label="Calculate univariate statistics from raster based on vector objects" module="v.rast.stats">
 	<option key="raster"/>
-	<option key="vector" typemask="area" version_max="6"/>
-	<option key="map" typemask="area" version_min="7"/>
-	<option key="colprefix" version_max="6"/>
-	<option key="column_prefix" version_min="7"/>
+
+	<option key="map" typemask="area"/>
+
+	<option key="column_prefix"/>
 	<flag key="c" answer="off" hidden="yes" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.sample.qgm b/src/plugins/grass/modules/v.sample.qgm
index 8c417d6e6cf..6ea2189f9f8 100644
--- a/src/plugins/grass/modules/v.sample.qgm
+++ b/src/plugins/grass/modules/v.sample.qgm
@@ -6,7 +6,7 @@
 	<field key="column" layer="input" type="integer,double"/>
 	<option key="raster"/>
 	<option key="output"/>
-	<flag key="b" answer="off" hidden="no" version_max="6"/>
-	<flag key="c" answer="off" hidden="no" version_max="6"/>
-		<option key="method" answer="nearest" advanced="yes" version_min="7"/>
+
+
+		<option key="method" answer="nearest" advanced="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.segment.qgm b/src/plugins/grass/modules/v.segment.qgm
index dc73f22f34a..f34f78e48d8 100644
--- a/src/plugins/grass/modules/v.segment.qgm
+++ b/src/plugins/grass/modules/v.segment.qgm
@@ -2,9 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Create points/segments from input vector lines and positions" module="v.segment">
-	<option key="input" layeroption="llayer" typemask="line,boundary" version_max="6"/>
-	<option key="input" layeroption="layer" typemask="line,boundary" version_min="7"/>
-	<file key="file" type="old" filters="Txt (*.txt);;Csv (*.csv)" version_max="6"/>
-	<file key="rules" type="old" filters="Txt (*.txt);;Csv (*.csv)" version_min="7"/>
+
+	<option key="input" layeroption="layer" typemask="line,boundary"/>
+
+	<file key="rules" type="old" filters="Txt (*.txt);;Csv (*.csv)"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.support.qgm b/src/plugins/grass/modules/v.support.qgm
index 257c5cf6de5..831c2752c3f 100644
--- a/src/plugins/grass/modules/v.support.qgm
+++ b/src/plugins/grass/modules/v.support.qgm
@@ -10,8 +10,8 @@
 	<option key="map_date" />
 	<option key="scale" />
 	<option key="zone" />
-	<option key="thresh" version_max="6"/>
-	<option key="threshold" version_min="7"/>
+
+	<option key="threshold"/>
 	<option key="comment" />
 	<option key="cmdhist" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.surf.bspline.qgm b/src/plugins/grass/modules/v.surf.bspline.qgm
index 032bfba1713..65ce2232965 100644
--- a/src/plugins/grass/modules/v.surf.bspline.qgm
+++ b/src/plugins/grass/modules/v.surf.bspline.qgm
@@ -3,16 +3,16 @@
 
 <qgisgrassmodule label="Bicubic or bilinear spline interpolation with Tykhonov regularization" module="v.surf.bspline">
 	<option key="input"/>
-	<option key="sparse" version_max="6"/>
-	<option key="sparse_input" version_min="7"/>
-        <option key="sie" advanced="yes" version_max="6"/>
-        <option key="ew_step" advanced="yes" version_min="7"/>
-        <option key="sin" advanced="yes" version_max="6"/>
-        <option key="ns_step" advanced="yes" version_min="7"/>
+
+	<option key="sparse_input"/>
+
+        <option key="ew_step" advanced="yes"/>
+
+        <option key="ns_step" advanced="yes"/>
         <option key="method" advanced="yes"/>
         <option key="lambda_i" advanced="yes"/>
         <option key="output" advanced="yes"/>
-	<option key="raster" version_max="6"/>
-	<option key="raster_output" version_min="7"/>
+
+	<option key="raster_output"/>
 	<flag key="c" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.surf.rst.qgm b/src/plugins/grass/modules/v.surf.rst.qgm
index ac017204057..12bb6f469ec 100644
--- a/src/plugins/grass/modules/v.surf.rst.qgm
+++ b/src/plugins/grass/modules/v.surf.rst.qgm
@@ -6,8 +6,8 @@
 	<field key="zcolumn" layer="input" type="integer,double" label="Attribute field (interpolated values)" />
 	<option key="tension" />
 	<!--option key="smooth" /-->
-	<option key="elev" version_max="6"/>
-	<option key="elevation" version_min="7"/>
+
+	<option key="elevation"/>
 		<option key="segmax" advanced="yes" />
 		<option key="npmin" advanced="yes" />
 		<option key="dmin" advanced="yes" />
@@ -15,23 +15,23 @@
         <option key="where" advanced="yes" />
 		<option key="slope" advanced="yes" />
         <option key="aspect" advanced="yes" />
-        <option key="pcurv" advanced="yes" version_max="6"/>
-        <option key="pcurvature" advanced="yes" version_min="7"/>
-        <option key="tcurv" advanced="yes" version_max="6"/>
-        <option key="tcurvature" advanced="yes" version_min="7"/>
-        <option key="mcurv" advanced="yes" version_max="6"/>
-        <option key="mcurvature" advanced="yes" version_min="7"/>
-        <option key="devi" advanced="yes" version_max="6"/>
-        <option key="deviations" advanced="yes" version_min="7"/>
+
+        <option key="pcurvature" advanced="yes"/>
+
+        <option key="tcurvature" advanced="yes"/>
+
+        <option key="mcurvature" advanced="yes"/>
+
+        <option key="deviations" advanced="yes"/>
         <option key="cvdev" advanced="yes" />
-        <option key="treefile" advanced="yes" version_max="6"/>
-        <option key="treeseg" advanced="yes" version_min="7"/>
-        <option key="overfile" advanced="yes" version_max="6"/>
-        <option key="overwin" advanced="yes" version_min="7"/>
-        <option key="scolumn" advanced="yes" version_max="6"/>
-        <option key="smooth_column" advanced="yes" version_min="7"/>
-    <option key="zmult" hidden="yes" version_max="6"/>
-    <option key="zscale" hidden="yes" version_min="7"/>
+
+        <option key="treeseg" advanced="yes"/>
+
+        <option key="overwin" advanced="yes"/>
+
+        <option key="smooth_column" advanced="yes"/>
+
+    <option key="zscale" hidden="yes"/>
 		<option key="theta" advanced="yes"/>
 		<option key="scalex" advanced="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.to.db.qgm b/src/plugins/grass/modules/v.to.db.qgm
index 8b8bb268460..8e946fae5e3 100644
--- a/src/plugins/grass/modules/v.to.db.qgm
+++ b/src/plugins/grass/modules/v.to.db.qgm
@@ -5,6 +5,6 @@
 	<option key="map" layeroption="layer"/>
 	<option key="option"/>
 	<option key="units"/>
-	<field key="column" layer="map" type="integer,double" label="Attribute field" version_max="6.3" />
-	<field key="columns" layer="map" type="integer,double" label="Attribute field" version_min="6.4" />
+^.*version_max="6.3".*$
+	<field key="columns" layer="map" type="integer,double" label="Attribute field" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.to.points.qgm b/src/plugins/grass/modules/v.to.points.qgm
index 1a46012ea24..40d5dbd414a 100644
--- a/src/plugins/grass/modules/v.to.points.qgm
+++ b/src/plugins/grass/modules/v.to.points.qgm
@@ -2,11 +2,11 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Create points along input lines" module="v.to.points">
-	<option key="input" layeroption="llayer" typeoption="type" version_max="6"/>
-	<option key="input" layeroption="layer" typeoption="type" version_min="7"/>
+
+	<option key="input" layeroption="layer" typeoption="type"/>
 	<option key="output"/>
 	<option key="dmax" answer="100" hidden="no"/>
-	<flag key="v" answer="on" hidden="no" version_max="6"/>
-	<option key="use" answer="vertex" hidden="no" version_min="7"/>
+
+	<option key="use" answer="vertex" hidden="no"/>
 	<flag key="i"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.to.rast.attr.qgm b/src/plugins/grass/modules/v.to.rast.attr.qgm
index feec81ba292..1188b58dc71 100644
--- a/src/plugins/grass/modules/v.to.rast.attr.qgm
+++ b/src/plugins/grass/modules/v.to.rast.attr.qgm
@@ -3,8 +3,8 @@
 
 <qgisgrassmodule label="Convert vector to raster using attribute values" module="v.to.rast">
 	<option key="input" layeroption="layer"/>
-	<field key="column" layer="input" type="integer,double" label="Attribute field" version_max="6.4"/>
-	<field key="attribute_column" layer="input" type="integer,double" label="Attribute field" version_min="7.0"/>
+
+	<field key="attribute_column" layer="input" type="integer,double" label="Attribute field"/>
 	<option key="output"/>
 	<option key="use" answer="attr" hidden="yes" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.type.bl.qgm b/src/plugins/grass/modules/v.type.bl.qgm
index 8fc5f4f35d2..0163cffb7d0 100644
--- a/src/plugins/grass/modules/v.type.bl.qgm
+++ b/src/plugins/grass/modules/v.type.bl.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Convert boundaries to lines" module="v.type">
 	<option key="input" typemask="area"/>
 	<option key="output"/>
-	<option key="type" answer="boundary,line" hidden="yes" version_max="6"/>
-	<option key="from_type" answer="boundary" hidden="yes" version_min="7"/>
-	<option key="to_type" answer="line" hidden="yes" version_min="7"/>
+
+	<option key="from_type" answer="boundary" hidden="yes"/>
+	<option key="to_type" answer="line" hidden="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.type.cp.qgm b/src/plugins/grass/modules/v.type.cp.qgm
index 677b0063723..797e294427e 100644
--- a/src/plugins/grass/modules/v.type.cp.qgm
+++ b/src/plugins/grass/modules/v.type.cp.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Convert centroids to points" module="v.type">
 	<option key="input" typemask="area"/>
 	<option key="output"/>
-	<option key="type" answer="centroid,point" hidden="yes" version_max="6"/>
-	<option key="from_type" answer="centroid" hidden="yes" version_min="7"/>
-	<option key="to_type" answer="point" hidden="yes" version_min="7"/>
+
+	<option key="from_type" answer="centroid" hidden="yes"/>
+	<option key="to_type" answer="point" hidden="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.type.lb.qgm b/src/plugins/grass/modules/v.type.lb.qgm
index 8d532363ce9..32c3cff41a8 100644
--- a/src/plugins/grass/modules/v.type.lb.qgm
+++ b/src/plugins/grass/modules/v.type.lb.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Convert lines to boundaries" module="v.type">
 	<option key="input" typemask="line"/>
 	<option key="output"/>
-	<option key="type" answer="line,boundary" hidden="yes" version_max="6"/>
-	<option key="from_type" answer="line" hidden="yes" version_min="7"/>
-	<option key="to_type" answer="boundary" hidden="yes" version_min="7"/>
+
+	<option key="from_type" answer="line" hidden="yes"/>
+	<option key="to_type" answer="boundary" hidden="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.type.pc.qgm b/src/plugins/grass/modules/v.type.pc.qgm
index a0fe6589d63..ad83e9208f3 100644
--- a/src/plugins/grass/modules/v.type.pc.qgm
+++ b/src/plugins/grass/modules/v.type.pc.qgm
@@ -4,7 +4,7 @@
 <qgisgrassmodule label="Convert points to centroids" module="v.type">
 	<option key="input" typemask="point"/>
 	<option key="output"/>
-	<option key="type" answer="point,centroid" hidden="yes" version_max="6"/>
-	<option key="from_type" answer="point" hidden="yes" version_min="7"/>
-	<option key="to_type" answer="centroid" hidden="yes" version_min="7"/>
+
+	<option key="from_type" answer="point" hidden="yes"/>
+	<option key="to_type" answer="centroid" hidden="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.what.rast.qgm b/src/plugins/grass/modules/v.what.rast.qgm
index 8c006d434be..03b5bc8e5b0 100644
--- a/src/plugins/grass/modules/v.what.rast.qgm
+++ b/src/plugins/grass/modules/v.what.rast.qgm
@@ -2,9 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Upload raster values at positions of vector points to the table" module="v.what.rast">
-	<option key="vector" layeroption="layer" typemask="point" version_max="6"/>
-	<option key="map" layeroption="layer" typemask="point" version_min="7"/>
-	<field key="column" layer="vector" type="integer,double" version_max="6"/>
-	<field key="column" layer="map" type="integer,double" version_min="7"/>
+
+	<option key="map" layeroption="layer" typemask="point"/>
+
+	<field key="column" layer="map" type="integer,double"/>
 	<option key="raster"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.what.vect.qgm b/src/plugins/grass/modules/v.what.vect.qgm
index be28281ac88..5e1165606b6 100644
--- a/src/plugins/grass/modules/v.what.vect.qgm
+++ b/src/plugins/grass/modules/v.what.vect.qgm
@@ -2,12 +2,12 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Upload vector values at positions of vector points" module="v.what.vect">
-	<option key="vector" layeroption="layer" typemask="point" version_max="6"/>
-	<option key="map" layeroption="layer" typemask="point" version_min="7"/>
-	<field key="column" layer="vector" type="integer,double,string" version_max="6"/>
-	<field key="column" layer="map" type="integer,double,string" version_min="7"/>
-	<option key="qvector" layeroption="qlayer" typemask="area" version_max="6"/>
-	<option key="query_map" layeroption="query_layer" typemask="area" version_min="7"/>
-	<field key="qcolumn" layer="qvector" type="integer,double,string" version_max="6"/>
-	<field key="query_column" layer="query_map" type="integer,double,string" version_min="7"/>
+
+	<option key="map" layeroption="layer" typemask="point"/>
+
+	<field key="column" layer="map" type="integer,double,string"/>
+
+	<option key="query_map" layeroption="query_layer" typemask="area"/>
+
+	<field key="query_column" layer="query_map" type="integer,double,string"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
index 04d36f9b341..da79d952e31 100644
--- a/src/plugins/grass/qgsgrassmodule.cpp
+++ b/src/plugins/grass/qgsgrassmodule.cpp
@@ -537,15 +537,7 @@ void QgsGrassModule::run()
         if ( ret == QMessageBox::Cancel )
           return;
 
-#if GRASS_VERSION_MAJOR < 7
-        // r.mapcalc does not use standard parser (does not accept --o) in GRASS 6
-        if ( mXName != "r.mapcalc" )
-        {
-          arguments.append( "--o" );
-        }
-#else
         arguments.append( QStringLiteral( "--o" ) );
-#endif
       }
     }
 
diff --git a/src/plugins/grass/qgsgrassmoduleinput.cpp b/src/plugins/grass/qgsgrassmoduleinput.cpp
index 6dcb2e19144..f73ca596f67 100644
--- a/src/plugins/grass/qgsgrassmoduleinput.cpp
+++ b/src/plugins/grass/qgsgrassmoduleinput.cpp
@@ -44,11 +44,7 @@
 
 extern "C"
 {
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
-#endif
 }
 
 #include "qgsgrassmoduleinput.h"
@@ -117,9 +113,7 @@ void QgsGrassModuleInputModel::onDirectoryChanged( const QString &path )
       watch( path + "/" + watchedDir );
     }
     // TODO: use db path defined in mapset VAR
-#if GRASS_VERSION_MAJOR >= 7
     watch( path + "/tgis/sqlite.db" );
-#endif
   }
   else // cellhd or vector dir
   {
@@ -209,9 +203,7 @@ void QgsGrassModuleInputModel::refreshMapset( QStandardItem *mapsetItem, const Q
   if ( typesCopy.isEmpty() )
   {
     typesCopy << QgsGrassObject::Raster << QgsGrassObject::Vector;
-#if GRASS_VERSION_MAJOR >= 7
     typesCopy << QgsGrassObject::Strds << QgsGrassObject::Stvds << QgsGrassObject::Str3ds;
-#endif
   }
   Q_FOREACH ( QgsGrassObject::Type type, typesCopy )
   {
@@ -305,9 +297,7 @@ void QgsGrassModuleInputModel::reload()
     {
       watch( dirPath + "/" + watchedDir );
     }
-#if GRASS_VERSION_MAJOR >= 7
     watch( dirPath + "/tgis/sqlite.db" );
-#endif
   }
 }
 
diff --git a/src/plugins/grass/qgsgrassmoduleinput.h b/src/plugins/grass/qgsgrassmoduleinput.h
index d4682ca0104..101e6cd12ce 100644
--- a/src/plugins/grass/qgsgrassmoduleinput.h
+++ b/src/plugins/grass/qgsgrassmoduleinput.h
@@ -42,11 +42,7 @@
 
 extern "C"
 {
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
-#endif
 }
 
 class QgsGrassModuleInputModel : public QStandardItemModel
diff --git a/src/plugins/grass/qgsgrassmoduleoptions.cpp b/src/plugins/grass/qgsgrassmoduleoptions.cpp
index b784967793f..697856f738a 100644
--- a/src/plugins/grass/qgsgrassmoduleoptions.cpp
+++ b/src/plugins/grass/qgsgrassmoduleoptions.cpp
@@ -37,14 +37,6 @@
 #include "qgsgrassmoduleparam.h"
 #include "qgsgrassplugin.h"
 
-extern "C"
-{
-#if GRASS_VERSION_MAJOR < 7
-#else
-#define G_adjust_Cell_head(cellhd,row_flag,col_flag) (G_adjust_Cell_head(cellhd,row_flag,col_flag),0)
-#endif
-}
-
 /******************* QgsGrassModuleOptions *******************/
 
 QgsGrassModuleOptions::QgsGrassModuleOptions(
diff --git a/src/plugins/grass/qgsgrassmoduleparam.cpp b/src/plugins/grass/qgsgrassmoduleparam.cpp
index 010942fdb7d..04cc3a7c75d 100644
--- a/src/plugins/grass/qgsgrassmoduleparam.cpp
+++ b/src/plugins/grass/qgsgrassmoduleparam.cpp
@@ -38,11 +38,7 @@
 #if 0
 extern "C"
 {
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
-#endif
 }
 #endif
 
@@ -175,17 +171,10 @@ QList<QDomNode> QgsGrassModuleParam::nodesByType( QDomElement descDomElement, ST
 
   // Not all options have prompt set, for example G_OPT_V_TYPE and G_OPT_V_FIELD, which would be useful, don't have prompt
   QMap<QString, STD_OPT> typeMap;
-#if GRASS_VERSION_MAJOR < 7
-  typeMap.insert( "dbtable", G_OPT_TABLE );
-  typeMap.insert( "dbdriver", G_OPT_DRIVER );
-  typeMap.insert( "dbname", G_OPT_DATABASE );
-  typeMap.insert( "dbcolumn", G_OPT_COLUMN );
-#else
   typeMap.insert( QStringLiteral( "dbtable" ), G_OPT_DB_TABLE );
   typeMap.insert( QStringLiteral( "dbdriver" ), G_OPT_DB_DRIVER );
   typeMap.insert( QStringLiteral( "dbname" ), G_OPT_DB_DATABASE );
   typeMap.insert( QStringLiteral( "dbcolumn" ), G_OPT_DB_COLUMN );
-#endif
   typeMap.insert( QStringLiteral( "vector" ), G_OPT_V_INPUT );
 
   QDomNode n = descDomElement.firstChild();
diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp
index 250fa4071c1..6d67ff29e92 100644
--- a/src/plugins/grass/qgsgrassnewmapset.cpp
+++ b/src/plugins/grass/qgsgrassnewmapset.cpp
@@ -1235,11 +1235,7 @@ void QgsGrassNewMapset::createMapset()
     QString error;
     G_TRY
     {
-#if GRASS_VERSION_MAJOR < 7
-      ret = G_make_location( location.toUtf8().data(), &mCellHead, mProjInfo, mProjUnits, stdout );
-#else
       ret = G_make_location( location.toUtf8().data(), &mCellHead, mProjInfo, mProjUnits );
-#endif
     }
     G_CATCH( QgsGrass::Exception & e )
     {
diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
index 6bfe9a4ee0d..efb7cd37427 100644
--- a/src/plugins/grass/qgsgrassplugin.cpp
+++ b/src/plugins/grass/qgsgrassplugin.cpp
@@ -48,11 +48,7 @@
 
 extern "C"
 {
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
-#endif
 #include <grass/version.h>
 }
 
@@ -607,12 +603,7 @@ void QgsGrassPlugin::newVector()
     Map = QgsGrass::vectNewMapStruct();
     Vect_open_new( Map, name.toUtf8().data(), 0 );
 
-#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \
-  ( ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 4 ) || GRASS_VERSION_MAJOR > 6 )
     Vect_build( Map );
-#else
-    Vect_build( Map, stderr );
-#endif
     Vect_set_release_support( Map );
     Vect_close( Map );
     QgsGrass::vectDestroyMapStruct( Map );
diff --git a/src/plugins/grass/qgsgrassselect.cpp b/src/plugins/grass/qgsgrassselect.cpp
index 0163eccbfe2..4e4e5c6840c 100644
--- a/src/plugins/grass/qgsgrassselect.cpp
+++ b/src/plugins/grass/qgsgrassselect.cpp
@@ -25,12 +25,7 @@
 
 extern "C"
 {
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
-#define BOUND_BOX bound_box
-#endif
 }
 
 
diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp
index e0f36ba5812..8b18c86e573 100644
--- a/src/plugins/grass/qgsgrasstools.cpp
+++ b/src/plugins/grass/qgsgrasstools.cpp
@@ -673,6 +673,7 @@ void QgsGrassTools::on_mFilterInput_textChanged( QString text )
 
 void QgsGrassTools::itemClicked( const QModelIndex &index )
 {
+  QgsDebugMsg( "Entered" );
   if ( index.column() == 0 )
   {
     //
@@ -685,7 +686,7 @@ void QgsGrassTools::itemClicked( const QModelIndex &index )
     {
       return;
     }
-    QModelIndex index = proxyModel->mapToSource( index );
+    QModelIndex modelIndex = proxyModel->mapToSource( index );
 
     QStandardItemModel *model = 0;
     if ( proxyModel == mTreeModelProxy )
@@ -697,7 +698,7 @@ void QgsGrassTools::itemClicked( const QModelIndex &index )
       model = mModulesListModel;
     }
 
-    QStandardItem *mypItem = model->itemFromIndex( index );
+    QStandardItem *mypItem = model->itemFromIndex( modelIndex );
     if ( mypItem )
     {
       QString myModuleName = mypItem->data( Qt::UserRole + Name ).toString();
diff --git a/src/providers/grass/qgis.d.rast.c b/src/providers/grass/qgis.d.rast.c
index 32c11f659d3..ec81be40734 100644
--- a/src/providers/grass/qgis.d.rast.c
+++ b/src/providers/grass/qgis.d.rast.c
@@ -45,24 +45,6 @@
 #define NAN (INFINITY-INFINITY)
 #endif
 
-#if GRASS_VERSION_MAJOR >= 7
-#define G_allocate_raster_buf Rast_allocate_buf
-#define G_close_cell Rast_close
-#define G_free_colors Rast_free_colors
-#define G_get_cellhd Rast_get_cellhd
-#define G_get_raster_map_type Rast_get_map_type
-#define G_get_raster_row Rast_get_row
-#define G_is_null_value Rast_is_null_value
-#define G_lookup_raster_colors Rast_lookup_colors
-#define G_open_cell_old Rast_open_old
-#define G_raster_map_type Rast_map_type
-#define G_raster_size Rast_cell_size
-#define G_read_colors Rast_read_colors
-#define G_window_cols Rast_window_cols
-#define G_window_rows Rast_window_rows
-#define G_suppress_masking Rast_suppress_masking
-#endif
-
 int display( char *name, char *mapset, RASTER_MAP_TYPE data_type, char *format );
 
 int main( int argc, char **argv )
@@ -101,20 +83,12 @@ int main( int argc, char **argv )
     exit( EXIT_FAILURE );
 
   name = map->answer;
-
-  /* Make sure map is available */
-#if GRASS_VERSION_MAJOR < 7
-  mapset = G_find_cell2( name, "" );
-  if ( !mapset )
-    G_fatal_error( ( "Raster map <%s> not found" ), name );
-#else
   mapset = "";
-#endif
 
   /* It can happen that GRASS data set is 'corrupted' and zone differs in WIND and
-   * cellhd, and G_open_cell_old fails, so it is better to read window from map */
+   * cellhd, and Rast_open_old fails, so it is better to read window from map */
   /* G_get_window( &window ); */
-  G_get_cellhd( name, mapset, &window );
+  Rast_get_cellhd( name, mapset, &window );
   window.west = atof( win->answers[0] );
   window.south = atof( win->answers[1] );
   window.east = atof( win->answers[2] );
@@ -124,9 +98,9 @@ int main( int argc, char **argv )
   G_adjust_Cell_head( &window, 1, 1 );
   G_set_window( &window );
 
-  G_suppress_masking(); // must be after G_set_window()
+  Rast_suppress_masking(); // must be after G_set_window()
 
-  raster_type = G_raster_map_type( name, "" );
+  raster_type = Rast_map_type( name, "" );
 
   display( name, mapset, raster_type, format->answer );
 
@@ -142,7 +116,7 @@ int display( char *name,
 {
   struct Colors colors;
 
-  if ( G_read_colors( name, mapset, &colors ) == -1 )
+  if ( Rast_read_colors( name, mapset, &colors ) == -1 )
     G_fatal_error( ( "Color file for <%s> not available" ), name );
 
   //G_set_null_value_color(r, g, b, &colors);
@@ -151,7 +125,7 @@ int display( char *name,
   cell_draw( name, mapset, &colors, data_type, format );
 
   /* release the colors now */
-  G_free_colors( &colors );
+  Rast_free_colors( &colors );
 
   return 0;
 }
@@ -188,15 +162,15 @@ static int cell_draw( char *name,
 
   big_endian = !( *( ( char * )( &one ) ) );
 
-  ncols = G_window_cols();
-  nrows = G_window_rows();
+  ncols = Rast_window_cols();
+  nrows = Rast_window_rows();
 
   /* Make sure map is available */
-  if ( ( cellfile = G_open_cell_old( name, mapset ) ) == -1 )
+  if ( ( cellfile = Rast_open_old( name, mapset ) ) == -1 )
     G_fatal_error( ( "Unable to open raster map <%s>" ), name );
 
   /* Allocate space for cell buffer */
-  xarray = G_allocate_raster_buf( data_type );
+  xarray = Rast_allocate_buf( data_type );
   red = G_malloc( ncols );
   grn = G_malloc( ncols );
   blu = G_malloc( ncols );
@@ -211,23 +185,23 @@ static int cell_draw( char *name,
   // Unfortunately this is not sufficient on Windows to switch stdout to binary mode
   fo = fdopen( fileno( stdout ), "wb" );
 
-  raster_size = G_raster_size( data_type );
+  raster_size = Rast_cell_size( data_type );
   //fprintf( fo, "%d %d", data_type, raster_size );
   //exit(0);
   /* loop for array rows */
   for ( row = 0; row < nrows; row++ )
   {
-    G_get_raster_row( cellfile, xarray, row, data_type );
+    Rast_get_row( cellfile, xarray, row, data_type );
     ptr = xarray;
 
-    G_lookup_raster_colors( xarray, red, grn, blu, set, ncols, colors,
-                            data_type );
+    Rast_lookup_colors( xarray, red, grn, blu, set, ncols, colors,
+                        data_type );
 
     for ( i = 0; i < ncols; i++ )
     {
       unsigned char alpha = 255;
       //G_debug ( 0, "row = %d col = %d", row, i );
-      if ( G_is_null_value( ptr, data_type ) )
+      if ( Rast_is_null_value( ptr, data_type ) )
       {
         alpha = 0;
       }
@@ -254,7 +228,7 @@ static int cell_draw( char *name,
         {
           //G_debug ( 0, "valx = %d", *((CELL *) ptr));
         }
-        if ( G_is_null_value( ptr, data_type ) )
+        if ( Rast_is_null_value( ptr, data_type ) )
         {
           // see comments in QgsGrassRasterProvider::noDataValue()
           if ( data_type == CELL_TYPE )
@@ -283,7 +257,7 @@ static int cell_draw( char *name,
     }
   }
 
-  G_close_cell( cellfile );
+  Rast_close( cellfile );
   fclose( fo );
 
   return ( 0 );
diff --git a/src/providers/grass/qgis.g.info.c b/src/providers/grass/qgis.g.info.c
index b3dbb7c8a5e..c48d327ac60 100644
--- a/src/providers/grass/qgis.g.info.c
+++ b/src/providers/grass/qgis.g.info.c
@@ -37,29 +37,6 @@
 #endif
 #include <grass/gprojects.h>
 
-#if GRASS_VERSION_MAJOR >= 7
-#define G_allocate_c_raster_buf Rast_allocate_c_buf
-#define G_allocate_d_raster_buf Rast_allocate_d_buf
-#define G_close_cell Rast_close
-#define G_colors_count Rast_colors_count
-#define G_easting_to_col Rast_easting_to_col
-#define G_get_c_raster_row Rast_get_c_row
-#define G_get_cellhd Rast_get_cellhd
-#define G_get_d_raster_row Rast_get_d_row
-#define G_get_f_color_rule Rast_get_fp_color_rule
-#define G_get_fp_range_min_max Rast_get_fp_range_min_max
-#define G_get_raster_map_type Rast_get_map_type
-#define G_is_null_value Rast_is_null_value
-#define G_northing_to_row Rast_northing_to_row
-#define G_open_cell_old Rast_open_old
-#define G_raster_map_type Rast_map_type
-#define G_read_colors Rast_read_colors
-#define G_read_fp_range Rast_read_fp_range
-#define G_window_cols Rast_window_cols
-#define G_window_rows Rast_window_rows
-#define G_suppress_masking Rast_suppress_masking
-#endif
-
 int main( int argc, char **argv )
 {
   struct GModule *module;
@@ -136,7 +113,7 @@ int main( int argc, char **argv )
   {
     if ( rast_opt->answer )
     {
-      G_get_cellhd( rast_opt->answer, "", &window );
+      Rast_get_cellhd( rast_opt->answer, "", &window );
       fprintf( stdout, "%f,%f,%f,%f", window.west, window.south, window.east, window.north );
     }
     else if ( vect_opt->answer )
@@ -149,7 +126,7 @@ int main( int argc, char **argv )
   {
     if ( rast_opt->answer )
     {
-      G_get_cellhd( rast_opt->answer, "", &window );
+      Rast_get_cellhd( rast_opt->answer, "", &window );
       fprintf( stdout, "%d,%d", window.cols, window.rows );
     }
     else if ( vect_opt->answer )
@@ -164,15 +141,15 @@ int main( int argc, char **argv )
     double zmin, zmax;
 
     // Data type
-    RASTER_MAP_TYPE raster_type = G_raster_map_type( rast_opt->answer, "" );
+    RASTER_MAP_TYPE raster_type = Rast_map_type( rast_opt->answer, "" );
     fprintf( stdout, "TYPE:%d\n", raster_type );
 
     // Statistics
-    if ( G_read_fp_range( rast_opt->answer, "", &range ) < 0 )
+    if ( Rast_read_fp_range( rast_opt->answer, "", &range ) < 0 )
     {
       G_fatal_error( ( "Unable to read range file" ) );
     }
-    G_get_fp_range_min_max( &range, &zmin, &zmax );
+    Rast_get_fp_range_min_max( &range, &zmin, &zmax );
     fprintf( stdout, "MIN_VALUE:%.17e\n", zmin );
     fprintf( stdout, "MAX_VALUE:%.17e\n", zmax );
   }
@@ -181,19 +158,19 @@ int main( int argc, char **argv )
     // Color table
     struct Colors colors;
     int i, ccount;
-    if ( G_read_colors( rast_opt->answer, "", &colors ) == 1 )
+    if ( Rast_read_colors( rast_opt->answer, "", &colors ) == 1 )
     {
       //int maxcolor;
       //CELL min, max;
 
       //G_get_color_range ( &min, &max, &colors);
-      ccount = G_colors_count( &colors );
+      ccount = Rast_colors_count( &colors );
       for ( i = ccount - 1; i >= 0; i-- )
       {
         DCELL val1, val2;
         unsigned char r1, g1, b1, r2, g2, b2;
 
-        G_get_f_color_rule( &val1, &r1, &g1, &b1, &val2, &r2, &g2, &b2, &colors, i );
+        Rast_get_fp_color_rule( &val1, &r1, &g1, &b1, &val2, &r2, &g2, &b2, &colors, i );
         fprintf( stdout, "%.17e %.17e %d %d %d %d %d %d\n", val1, val2, r1, g1, b1, r2, g2, b2 );
       }
     }
@@ -212,10 +189,10 @@ int main( int argc, char **argv )
       DCELL *dcell = 0;
       CELL *cell = 0;
       char buff[101];
-      G_get_cellhd( rast_opt->answer, "", &window );
+      Rast_get_cellhd( rast_opt->answer, "", &window );
       G_set_window( &window );
-      G_suppress_masking(); // must be after G_set_window()
-      fd = G_open_cell_old( rast_opt->answer, "" );
+      Rast_suppress_masking(); // must be after G_set_window()
+      fd = Rast_open_old( rast_opt->answer, "" );
       // wait for coords from stdin
       while ( fgets( buff, 100, stdin ) != 0 )
       {
@@ -225,8 +202,8 @@ int main( int argc, char **argv )
         }
         else
         {
-          col = ( int ) G_easting_to_col( x, &window );
-          row = ( int ) G_northing_to_row( y, &window );
+          col = ( int ) Rast_easting_to_col( x, &window );
+          row = ( int ) Rast_northing_to_row( y, &window );
           if ( col == window.cols )
             col--;
           if ( row == window.rows )
@@ -242,44 +219,23 @@ int main( int argc, char **argv )
             void *ptr = 0;
             double val;
 
-#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \
-    ( ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR > 2 ) || GRASS_VERSION_MAJOR > 6 )
-            rast_type = G_get_raster_map_type( fd );
-#else
-            rast_type = G_raster_map_type( rast_opt->answer, "" );
-#endif
-            cell = G_allocate_c_raster_buf();
-            dcell = G_allocate_d_raster_buf();
+            rast_type = Rast_get_map_type( fd );
+            cell = Rast_allocate_c_buf();
+            dcell = Rast_allocate_d_buf();
 
             if ( rast_type == CELL_TYPE )
             {
-#if GRASS_VERSION_MAJOR < 7
-              if ( G_get_c_raster_row( fd, cell, row ) < 0 )
-              {
-                G_fatal_error( ( "Unable to read raster map <%s> row %d" ),
-                               rast_opt->answer, row );
-              }
-#else
-              G_get_c_raster_row( fd, cell, row );
-#endif
+              Rast_get_c_row( fd, cell, row );
               val = cell[col];
               ptr = &( cell[col] );
             }
             else
             {
-#if GRASS_VERSION_MAJOR < 7
-              if ( G_get_d_raster_row( fd, dcell, row ) < 0 )
-              {
-                G_fatal_error( ( "Unable to read raster map <%s> row %d" ),
-                               rast_opt->answer, row );
-              }
-#else
-              G_get_d_raster_row( fd, dcell, row );
-#endif
+              Rast_get_d_row( fd, dcell, row );
               val = dcell[col];
               ptr = &( dcell[col] );
             }
-            if ( G_is_null_value( ptr, rast_type ) )
+            if ( Rast_is_null_value( ptr, rast_type ) )
             {
               fprintf( stdout, "value:nan\n" );
             }
@@ -291,7 +247,7 @@ int main( int argc, char **argv )
         }
         fflush( stdout );
       }
-      G_close_cell( fd );
+      Rast_close( fd );
     }
     else if ( vect_opt->answer )
     {
@@ -318,7 +274,7 @@ int main( int argc, char **argv )
       double squares_sum = 0; // sum of squares
       double stdev = 0; // standard deviation
 
-      G_get_cellhd( rast_opt->answer, "", &window );
+      Rast_get_cellhd( rast_opt->answer, "", &window );
       window.north = atof( north_opt->answer );
       window.south = atof( south_opt->answer );
       window.east = atof( east_opt->answer );
@@ -327,20 +283,15 @@ int main( int argc, char **argv )
       window.cols = ( int ) atoi( cols_opt->answer );
 
       G_set_window( &window );
-      G_suppress_masking(); // must be after G_set_window()
-      fd = G_open_cell_old( rast_opt->answer, "" );
+      Rast_suppress_masking(); // must be after G_set_window()
+      fd = Rast_open_old( rast_opt->answer, "" );
 
-      ncols = G_window_cols();
-      nrows = G_window_rows();
+      ncols = Rast_window_cols();
+      nrows = Rast_window_rows();
 
-#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \
-    ( ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR > 2 ) || GRASS_VERSION_MAJOR > 6 )
-      rast_type = G_get_raster_map_type( fd );
-#else
-      rast_type = G_raster_map_type( rast_opt->answer, "" );
-#endif
-      cell = G_allocate_c_raster_buf();
-      dcell = G_allocate_d_raster_buf();
+      rast_type = Rast_get_map_type( fd );
+      cell = Rast_allocate_c_buf();
+      dcell = Rast_allocate_d_buf();
 
       // Calc stats is very slow for large rasters -> prefer optimization for speed over
       // code length and readability (which is not currently true)
@@ -348,27 +299,11 @@ int main( int argc, char **argv )
       {
         if ( rast_type == CELL_TYPE )
         {
-#if GRASS_VERSION_MAJOR < 7
-          if ( G_get_c_raster_row( fd, cell, row ) < 0 )
-          {
-            G_fatal_error( ( "Unable to read raster map <%s> row %d" ),
-                           rast_opt->answer, row );
-          }
-#else
-          G_get_c_raster_row( fd, cell, row );
-#endif
+          Rast_get_c_row( fd, cell, row );
         }
         else
         {
-#if GRASS_VERSION_MAJOR < 7
-          if ( G_get_d_raster_row( fd, dcell, row ) < 0 )
-          {
-            G_fatal_error( ( "Unable to read raster map <%s> row %d" ),
-                           rast_opt->answer, row );
-          }
-#else
-          G_get_d_raster_row( fd, dcell, row );
-#endif
+          Rast_get_d_row( fd, dcell, row );
         }
 
         for ( col = 0; col < ncols; col++ )
@@ -383,7 +318,7 @@ int main( int argc, char **argv )
             val = dcell[col];
             ptr = &( dcell[col] );
           }
-          if ( ! G_is_null_value( ptr, rast_type ) )
+          if ( ! Rast_is_null_value( ptr, rast_type ) )
           {
             if ( val < min ) min = val;
             if ( val > max ) max = val;
@@ -405,7 +340,7 @@ int main( int argc, char **argv )
       fprintf( stdout, "STDEV:%.17e\n", stdev );
       fprintf( stdout, "SQSUM:%.17e\n", squares_sum );
 
-      G_close_cell( fd );
+      Rast_close( fd );
     }
     else if ( vect_opt->answer )
     {
diff --git a/src/providers/grass/qgis.r.in.cpp b/src/providers/grass/qgis.r.in.cpp
index a4224b53eaa..188a2f9e03a 100644
--- a/src/providers/grass/qgis.r.in.cpp
+++ b/src/providers/grass/qgis.r.in.cpp
@@ -40,27 +40,6 @@ extern "C"
 #include "qgsgrass.h"
 #include "qgsgrassdatafile.h"
 
-#if GRASS_VERSION_MAJOR >= 7
-#define G_allocate_raster_buf Rast_allocate_buf
-#define G_close_cell Rast_close
-#define G_get_raster_map_type Rast_get_map_type
-#define G_get_raster_row Rast_get_row
-#define G_is_null_value Rast_is_null_value
-#define G_open_raster_new Rast_open_new
-#define G_short_history Rast_short_history
-#define G_command_history Rast_command_history
-#define G_write_history Rast_write_history
-#define G_set_c_null_value Rast_set_c_null_value
-#define G_set_f_null_value Rast_set_f_null_value
-#define G_set_d_null_value Rast_set_d_null_value
-#define G_set_raster_value_c Rast_set_c_value
-#define G_set_raster_value_f Rast_set_f_value
-#define G_set_raster_value_d Rast_set_d_value
-#define G_put_raster_row Rast_put_row
-#define G_raster_size Rast_cell_size
-#define G_unopen_cell Rast_unopen
-#endif
-
 static int cf = -1;
 
 void checkStream( QDataStream &stream )
@@ -69,7 +48,7 @@ void checkStream( QDataStream &stream )
   {
     if ( cf != -1 )
     {
-      G_unopen_cell( cf );
+      Rast_unopen( cf );
       G_fatal_error( "Cannot read data stream" );
     }
   }
@@ -149,14 +128,14 @@ int main( int argc, char **argv )
       return 1;
   }
 
-  cf = G_open_raster_new( name, grass_type );
+  cf = Rast_open_new( name, grass_type );
   if ( cf < 0 )
   {
     G_fatal_error( "Unable to create raster map <%s>", name );
     return 1;
   }
 
-  void *buf = G_allocate_raster_buf( grass_type );
+  void *buf = Rast_allocate_buf( grass_type );
 
   int expectedSize = cols * QgsRasterBlock::typeSize( qgis_type );
   bool isCanceled = false;
@@ -197,39 +176,39 @@ int main( int argc, char **argv )
       {
         if ( ( CELL )cell[col] == ( CELL )noDataValue )
         {
-          G_set_c_null_value( ( CELL * )ptr, 1 );
+          Rast_set_c_null_value( ( CELL * )ptr, 1 );
         }
         else
         {
-          G_set_raster_value_c( ptr, ( CELL )( cell[col] ), grass_type );
+          Rast_set_c_value( ptr, ( CELL )( cell[col] ), grass_type );
         }
       }
       else if ( grass_type == FCELL_TYPE )
       {
         if ( ( FCELL )fcell[col] == ( FCELL )noDataValue )
         {
-          G_set_f_null_value( ( FCELL * )ptr, 1 );
+          Rast_set_f_null_value( ( FCELL * )ptr, 1 );
         }
         else
         {
-          G_set_raster_value_f( ptr, ( FCELL )( fcell[col] ), grass_type );
+          Rast_set_f_value( ptr, ( FCELL )( fcell[col] ), grass_type );
         }
       }
       else if ( grass_type == DCELL_TYPE )
       {
         if ( ( DCELL )dcell[col] == ( DCELL )noDataValue )
         {
-          G_set_d_null_value( ( DCELL * )ptr, 1 );
+          Rast_set_d_null_value( ( DCELL * )ptr, 1 );
         }
         else
         {
-          G_set_raster_value_d( ptr, ( DCELL )dcell[col], grass_type );
+          Rast_set_d_value( ptr, ( DCELL )dcell[col], grass_type );
         }
       }
 
-      ptr = G_incr_void_ptr( ptr, G_raster_size( grass_type ) );
+      ptr = G_incr_void_ptr( ptr, Rast_cell_size( grass_type ) );
     }
-    G_put_raster_row( cf, buf, grass_type );
+    Rast_put_row( cf, buf, grass_type );
 
 #ifndef Q_OS_WIN
     // Because stdin is somewhere buffered on Windows (not clear if in QProcess or by Windows)
@@ -243,15 +222,15 @@ int main( int argc, char **argv )
 
   if ( isCanceled )
   {
-    G_unopen_cell( cf );
+    Rast_unopen( cf );
   }
   else
   {
-    G_close_cell( cf );
+    Rast_close( cf );
     struct History history;
-    G_short_history( name, "raster", &history );
-    G_command_history( &history );
-    G_write_history( name, &history );
+    Rast_short_history( name, "raster", &history );
+    Rast_command_history( &history );
+    Rast_write_history( name, &history );
   }
 
   exit( EXIT_SUCCESS );
diff --git a/src/providers/grass/qgis.v.in.cpp b/src/providers/grass/qgis.v.in.cpp
index 9338f3e47a9..18976874968 100644
--- a/src/providers/grass/qgis.v.in.cpp
+++ b/src/providers/grass/qgis.v.in.cpp
@@ -27,12 +27,7 @@ extern "C"
 #include <grass/version.h>
 #include <grass/gis.h>
 #include <grass/dbmi.h>
-
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
-#endif
 }
 
 #include <QByteArray>
@@ -379,12 +374,8 @@ int main( int argc, char **argv )
     G_message( "Merging lines" );
     Vect_merge_lines( map, GV_BOUNDARY, nullptr, nullptr );
     G_message( "Removing bridges" );
-#if GRASS_VERSION_MAJOR < 7
-    Vect_remove_bridges( map, nullptr );
-#else
     int linesRemoved, bridgesRemoved;
     Vect_remove_bridges( map, nullptr, &linesRemoved, &bridgesRemoved );
-#endif
     G_message( "Attaching islands" );
     Vect_build_partial( map, GV_BUILD_ATTACH_ISLES );
 
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
index b4412babb6f..9bdb642ff21 100644
--- a/src/providers/grass/qgsgrass.cpp
+++ b/src/providers/grass/qgsgrass.cpp
@@ -64,27 +64,10 @@ extern "C"
 #undef M_PI_4 //avoid redefinition warning
 #endif
 #include <grass/gprojects.h>
-
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
 #include <grass/raster.h>
-#endif
 }
 
-#if GRASS_VERSION_MAJOR >= 7
-#define G_get_gdal_link Rast_get_gdal_link
-#define G_close_gdal_link Rast_close_gdal_link
-#endif
-
-#if !defined(GRASS_VERSION_MAJOR) || \
-    !defined(GRASS_VERSION_MINOR) || \
-    GRASS_VERSION_MAJOR<6 || \
-    (GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR <= 2)
-#define G__setenv(name,value) G__setenv( ( char * ) (name), (char *) (value) )
-#endif
-
 #define GRASS_LOCK sMutex.lock();
 #define GRASS_UNLOCK sMutex.unlock();
 
@@ -176,19 +159,11 @@ QString QgsGrassObject::elementShort() const
 QString QgsGrassObject::elementShort( Type type )
 {
   if ( type == Raster )
-#if GRASS_VERSION_MAJOR < 7
-    return "rast";
-#else
     return QStringLiteral( "raster" );
-#endif
   else if ( type == Group )
     return QStringLiteral( "group" );
   else if ( type == Vector )
-#if GRASS_VERSION_MAJOR < 7
-    return "vect";
-#else
     return QStringLiteral( "vector" );
-#endif
   else if ( type == Region )
     return QStringLiteral( "region" );
   else if ( type == Strds )
@@ -380,9 +355,7 @@ bool QgsGrass::init( void )
   // TODO7: Rast_suppress_masking (see G_suppress_masking() macro above) needs MAPSET
   // (it should not be necessary, because rasters are read by modules qgis.g.info and qgis.d.rast
   //  where masking is suppressed)
-#if GRASS_VERSION_MAJOR < 7
-  G_suppress_masking();
-#endif
+  //G_suppress_masking();
 
   // Set program name
   G_set_program_name( "QGIS" );
@@ -611,12 +584,12 @@ void QgsGrass::setMapset( const QString &gisdbase, const QString &location, cons
 
   // Set principal GRASS variables (in memory)
 #ifdef Q_OS_WIN
-  G__setenv( "GISDBASE", shortPath( gisdbase ).toUtf8().data() );
+  G_setenv_nogisrc( "GISDBASE", shortPath( gisdbase ).toUtf8().data() );
 #else
-  G__setenv( "GISDBASE", gisdbase.toUtf8().data() );
+  G_setenv_nogisrc( "GISDBASE", gisdbase.toUtf8().data() );
 #endif
-  G__setenv( "LOCATION_NAME", location.toUtf8().data() );
-  G__setenv( "MAPSET", mapset.toUtf8().data() );
+  G_setenv_nogisrc( "LOCATION_NAME", location.toUtf8().data() );
+  G_setenv_nogisrc( "MAPSET", mapset.toUtf8().data() );
 
   // Add all available mapsets to search path
   // Why? Other mapsets should not be necessary.
@@ -639,14 +612,10 @@ void QgsGrass::setMapset( const QString &gisdbase, const QString &location, cons
   for ( int i = 0; ms[i]; i++ )
   {
     G_add_mapset_to_search_path( ms[i] ); // only adds mapset if it is not yet in path
-#if GRASS_VERSION_MAJOR >= 7
     free( ms[i] );
-#endif
   }
-#if GRASS_VERSION_MAJOR >= 7
   free( ms );
 #endif
-#endif
 }
 
 void QgsGrass::setMapset( const QgsGrassObject &grassObject )
@@ -664,11 +633,7 @@ void QgsGrass::addMapsetToSearchPath( const QString &mapset, QString &error )
   QString cmd = gisbase() + "/bin/g.mapsets";
   QStringList arguments;
 
-#if GRASS_VERSION_MAJOR < 7
-  arguments << "addmapset=" + mapset;
-#else
   arguments << QStringLiteral( "operation=add" ) << "mapset=" + mapset;
-#endif
 
   try
   {
@@ -686,11 +651,7 @@ void QgsGrass::removeMapsetFromSearchPath( const QString &mapset, QString &error
   QString cmd = gisbase() + "/bin/g.mapsets";
   QStringList arguments;
 
-#if GRASS_VERSION_MAJOR < 7
-  arguments << "removemapset=" + mapset;
-#else
   arguments << QStringLiteral( "operation=remove" ) << "mapset=" + mapset;
-#endif
 
   try
   {
@@ -718,14 +679,8 @@ void QgsGrass::loadMapsetSearchPath()
   {
     QgsGrass::setMapset( getDefaultGisdbase(), getDefaultLocation(), getDefaultMapset() );
     const char *mapset = 0;
-#if GRASS_VERSION_MAJOR >= 7
     G_reset_mapsets();
     for ( int i = 0; ( mapset = G_get_mapset_name( i ) ); i++ )
-#else
-    int result = G_reset_mapsets();
-    Q_UNUSED( result );
-    for ( int i = 0; ( mapset = G__mapset_name( i ) ); i++ )
-#endif
     {
       QgsDebugMsg( QString( "mapset = %1" ).arg( mapset ) );
       if ( G_is_mapset_in_search_path( mapset ) )
@@ -849,11 +804,6 @@ int QgsGrass::error_routine( const char *msg, int fatal )
     // Exceptions cannot be thrown from here if GRASS lib is not compiled with -fexceptions
     //throw QgsGrass::Exception( QString::fromUtf8( msg ) );
     sLastError = Fatal;
-
-#if (GRASS_VERSION_MAJOR < 7)
-    // longjump() is called by G_fatal_error in GRASS >= 7
-    longjmp( QgsGrass::jumper, 1 );
-#endif
   }
   else
   {
@@ -1046,14 +996,14 @@ QString QgsGrass::openMapset( const QString &gisdbase,
   putEnv( QStringLiteral( "GISRC" ), sGisrc );
 
   // Reinitialize GRASS
-  G__setenv( "GISRC", sGisrc.toUtf8().data() );
+  G_setenv_nogisrc( "GISRC", sGisrc.toUtf8().data() );
 #ifdef Q_OS_WIN
-  G__setenv( "GISDBASE", shortPath( gisdbase ).toLocal8Bit().data() );
+  G_setenv_nogisrc( "GISDBASE", shortPath( gisdbase ).toLocal8Bit().data() );
 #else
-  G__setenv( "GISDBASE", gisdbase.toUtf8().data() );
+  G_setenv_nogisrc( "GISDBASE", gisdbase.toUtf8().data() );
 #endif
-  G__setenv( "LOCATION_NAME", location.toLocal8Bit().data() );
-  G__setenv( "MAPSET", mapset.toLocal8Bit().data() );
+  G_setenv_nogisrc( "LOCATION_NAME", location.toLocal8Bit().data() );
+  G_setenv_nogisrc( "MAPSET", mapset.toLocal8Bit().data() );
   sDefaultGisdbase = gisdbase;
   sDefaultLocation = location;
   sDefaultMapset = mapset;
@@ -1098,15 +1048,15 @@ QString QgsGrass::closeMapset()
     putenv( ( char * ) "GISRC" );
 
     // Reinitialize GRASS
-    G__setenv( "GISRC", ( char * ) "" );
+    G_setenv_nogisrc( "GISRC", ( char * ) "" );
 
     // Temporarily commented because of
     //   http://trac.osgeo.org/qgis/ticket/1900
     //   http://trac.osgeo.org/gdal/ticket/3313
     // it can be uncommented once GDAL with patch gets deployed (probably GDAL 1.8)
-    //G__setenv( "GISDBASE", ( char * ) "" );
-    //G__setenv( "LOCATION_NAME", ( char * ) "" );
-    //G__setenv( "MAPSET", ( char * ) "" );
+    //G_setenv_nogisrc( "GISDBASE", ( char * ) "" );
+    //G_setenv_nogisrc( "LOCATION_NAME", ( char * ) "" );
+    //G_setenv_nogisrc( "MAPSET", ( char * ) "" );
 
     sDefaultGisdbase = QLatin1String( "" );
     sDefaultLocation = QLatin1String( "" );
@@ -1401,9 +1351,8 @@ QStringList QgsGrass::vectorLayers( const QString &gisdbase, const QString &loca
     // add topology layers
     if ( vector.typeCount( GV_POINTS ) > 0 )
     {
-#if GRASS_VERSION_MAJOR < 7 /* no more point in GRASS 7 topo */
-      list.append( "topo_point" );
-#endif
+      /* no more point in GRASS 7 topo */
+      //list.append( "topo_point" );
     }
     if ( vector.typeCount( GV_LINES ) > 0 )
     {
@@ -1538,7 +1487,6 @@ QStringList QgsGrass::grassObjects( const QgsGrassObject &mapsetObject, QgsGrass
   else if ( type == QgsGrassObject::Strds || type == QgsGrassObject::Stvds
             || type == QgsGrassObject::Str3ds || type == QgsGrassObject::Stds )
   {
-#if GRASS_VERSION_MAJOR >= 7
     QString cmd = QStringLiteral( "t.list" );
 
     QStringList arguments;
@@ -1584,7 +1532,6 @@ QStringList QgsGrass::grassObjects( const QgsGrassObject &mapsetObject, QgsGrass
         QgsDebugMsg( QString( "Cannot run %1: %2" ).arg( cmd, e.what() ) );
       }
     }
-#endif
   }
   else
   {
@@ -1668,15 +1615,8 @@ void QgsGrass::region( const QString &gisdbase,
 {
   QgsGrass::setLocation( gisdbase, location );
 
-#if GRASS_VERSION_MAJOR < 7
-  if ( G__get_window( window, ( char * ) "", ( char * ) "WIND", mapset.toUtf8().data() ) )
-  {
-    throw QgsGrass::Exception( QObject::tr( "Cannot get current region" ) );
-  }
-#else
   // In GRASS 7 G__get_window does not return error code and calls G_fatal_error on error
-  G_FATAL_THROW( G__get_window( window, ( char * ) "", ( char * ) "WIND", mapset.toUtf8().data() ) );
-#endif
+  G_FATAL_THROW( G_get_element_window( window, ( char * ) "", ( char * ) "WIND", mapset.toUtf8().data() ) );
 }
 
 void QgsGrass::region( struct Cell_head *window )
@@ -1808,13 +1748,6 @@ QString QgsGrass::setRegion( struct Cell_head *window, const QgsRectangle &rect,
   window->cols = cols;
 
   QString error;
-#if GRASS_VERSION_MAJOR < 7
-  char *err = G_adjust_Cell_head( window, 1, 1 );
-  if ( err )
-  {
-    error = QString( err );
-  }
-#else
   try
   {
     G_adjust_Cell_head( window, 1, 1 );
@@ -1823,7 +1756,6 @@ QString QgsGrass::setRegion( struct Cell_head *window, const QgsRectangle &rect,
   {
     error = e.what();
   }
-#endif
   return error;
 }
 
@@ -1847,16 +1779,7 @@ bool QgsGrass::mapRegion( QgsGrassObject::Type type, const QString &gisdbase,
 
   if ( type == QgsGrassObject::Raster )
   {
-
     QString error = tr( "Cannot read raster map region (%1/%2/%3)" ).arg( gisdbase, location, mapset );
-#if GRASS_VERSION_MAJOR < 7
-    if ( G_get_cellhd( map.toUtf8().data(),
-                       mapset.toUtf8().data(), window ) < 0 )
-    {
-      warning( error );
-      return false;
-    }
-#else
     G_TRY
     {
       Rast_get_cellhd( map.toUtf8().data(), mapset.toUtf8().data(), window );
@@ -1866,7 +1789,6 @@ bool QgsGrass::mapRegion( QgsGrassObject::Type type, const QString &gisdbase,
       warning( error + " : " + e.what() );
       return false;
     }
-#endif
   }
   else if ( type == QgsGrassObject::Vector )
   {
@@ -1914,7 +1836,7 @@ bool QgsGrass::mapRegion( QgsGrassObject::Type type, const QString &gisdbase,
       return false;
     }
 
-    BOUND_BOX box;
+    bound_box box;
     Vect_get_map_box( Map, &box );
     window->north = box.N;
     window->south = box.S;
@@ -1942,26 +1864,16 @@ bool QgsGrass::mapRegion( QgsGrassObject::Type type, const QString &gisdbase,
   }
   else if ( type == QgsGrassObject::Region )
   {
-#if GRASS_VERSION_MAJOR < 7
-    if ( G__get_window( window, ( char * ) "windows",
-                        map.toUtf8().data(),
-                        mapset.toUtf8().data() ) )
-    {
-      warning( tr( "Cannot read region" ) );
-      return false;
-    }
-#else
     // G__get_window does not return error code in GRASS 7 and calls G_fatal_error on error
     G_TRY
     {
-      G__get_window( window, ( char * ) "windows", map.toUtf8().data(), mapset.toUtf8().data() );
+      G_get_element_window( window, ( char * ) "windows", map.toUtf8().data(), mapset.toUtf8().data() );
     }
     G_CATCH( QgsGrass::Exception & e )
     {
       warning( e );
       return false;
     }
-#endif
   }
   return true;
 }
@@ -2404,11 +2316,7 @@ bool QgsGrass::deleteObject( const QgsGrassObject &object )
   QString cmd = gisbase() + "/bin/g.remove";
   QStringList arguments;
 
-#if GRASS_VERSION_MAJOR < 7
-  arguments << object.elementShort() + "=" + object.name();
-#else
   arguments << QStringLiteral( "-f" ) << "type=" + object.elementShort() << "name=" + object.name();
-#endif
 
   try
   {
@@ -2441,12 +2349,7 @@ void QgsGrass::createVectorMap( const QgsGrassObject &object, QString &error )
   {
     Map = vectNewMapStruct();
     Vect_open_new( Map, object.name().toUtf8().data(), 0 );
-
-#if ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 4 ) || GRASS_VERSION_MAJOR > 6
     Vect_build( Map );
-#else
-    Vect_build( Map, stderr );
-#endif
     Vect_set_release_support( Map );
     Vect_close( Map );
   }
@@ -2590,11 +2493,11 @@ bool QgsGrass::isExternal( const QgsGrassObject &object )
   {
     QgsGrass::setLocation( object.gisdbase(), object.location() );
     struct GDAL_link *gdal;
-    gdal = G_get_gdal_link( object.name().toUtf8().data(), object.mapset().toUtf8().data() );
+    gdal = Rast_get_gdal_link( object.name().toUtf8().data(), object.mapset().toUtf8().data() );
     if ( gdal )
     {
       isExternal = true;
-      G_close_gdal_link( gdal );
+      Rast_close_gdal_link( gdal );
     }
   }
   G_CATCH( QgsGrass::Exception & e )
@@ -2607,15 +2510,7 @@ bool QgsGrass::isExternal( const QgsGrassObject &object )
 
 void QgsGrass::adjustCellHead( struct Cell_head *cellhd, int row_flag, int col_flag )
 {
-#if (GRASS_VERSION_MAJOR < 7)
-  char *err = G_adjust_Cell_head( cellhd, row_flag, col_flag );
-  if ( err )
-  {
-    throw QgsGrass::Exception( QObject::tr( "Cannot adjust region, error: '%1'" ).arg( err ) );
-  }
-#else
   G_FATAL_THROW( G_adjust_Cell_head( cellhd, row_flag, col_flag ) );
-#endif
 }
 
 // Map of vector types
diff --git a/src/providers/grass/qgsgrass.h b/src/providers/grass/qgsgrass.h
index 5f6b8d27fb2..19cc594ccd8 100644
--- a/src/providers/grass/qgsgrass.h
+++ b/src/providers/grass/qgsgrass.h
@@ -53,29 +53,11 @@ class QgsRectangle;
 #define GRASS_VERSION_RELEASE_STRING EXPAND( GRASS_VERSION_RELEASE )
 
 // try/catch like macros using setjmp
-#if (GRASS_VERSION_MAJOR < 7)
-#define G_TRY try { if( !setjmp(QgsGrass::jumper) )
-#else
 #define G_TRY try { if( !setjmp(*G_fatal_longjmp(1)) )
-#endif
 #define G_CATCH else { throw QgsGrass::Exception( QgsGrass::errorMessage() ); } } catch
 
 // Throw QgsGrass::Exception if G_fatal_error happens when calling F
-#if (GRASS_VERSION_MAJOR < 7)
-#define G_FATAL_THROW(F) if( !setjmp(QgsGrass::jumper) ) { F; } else { throw QgsGrass::Exception( QgsGrass::errorMessage() ); }
-#else
 #define G_FATAL_THROW(F) if( !setjmp(*G_fatal_longjmp(1)) ) { F; } else { throw QgsGrass::Exception( QgsGrass::errorMessage() ); }
-#endif
-
-#if GRASS_VERSION_MAJOR >= 7
-#define G_available_mapsets G_get_available_mapsets
-#define G__mapset_permissions2 G_mapset_permissions2
-#define G_suppress_masking Rast_suppress_masking
-#define G__get_window(window,element,name,mapset) (G_get_element_window(window,element,name,mapset),0)
-#define G__getenv G_getenv_nofatal
-#define G__setenv G_setenv_nogisrc
-#define BOUND_BOX bound_box
-#endif
 
 // Element info container
 class GRASS_LIB_EXPORT QgsGrassObject
diff --git a/src/providers/grass/qgsgrassfeatureiterator.cpp b/src/providers/grass/qgsgrassfeatureiterator.cpp
index 35adbb6ca2a..6a3b1f3d516 100644
--- a/src/providers/grass/qgsgrassfeatureiterator.cpp
+++ b/src/providers/grass/qgsgrassfeatureiterator.cpp
@@ -29,18 +29,9 @@
 extern "C"
 {
 #include <grass/version.h>
-
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
-#define BOUND_BOX bound_box
-#endif
 }
 
-#if GRASS_VERSION_MAJOR < 7
-#else
-
 void copy_boxlist_and_destroy( struct boxlist *blist, struct ilist *list )
 {
   Vect_reset_list( list );
@@ -63,7 +54,6 @@ void copy_boxlist_and_destroy( struct boxlist *blist, struct ilist *list )
     Vect_select_areas_by_box( (map), (box), blist); \
     copy_boxlist_and_destroy( blist, (list) );\
   }
-#endif
 
 //QMutex QgsGrassFeatureIterator::sMutex;
 
@@ -130,7 +120,7 @@ void QgsGrassFeatureIterator::setSelectionRect( const QgsRectangle &rect, bool u
 
   mSelection.fill( false );
 
-  BOUND_BOX box;
+  bound_box box;
   box.N = rect.yMaximum();
   box.S = rect.yMinimum();
   box.E = rect.xMaximum();
@@ -518,12 +508,8 @@ bool QgsGrassFeatureIterator::fetchFeature( QgsFeature &feature )
   {
     feature.initAttributes( mSource->mFields.size() );
     feature.setAttribute( 0, lid );
-#if GRASS_VERSION_MAJOR < 7
-    if ( mSource->mLayerType == QgsGrassProvider::TOPO_POINT || mSource->mLayerType == QgsGrassProvider::TOPO_LINE )
-#else
     /* No more topo points in GRASS 7 */
     if ( mSource->mLayerType == QgsGrassProvider::TopoLine )
-#endif
     {
       feature.setAttribute( 1, QgsGrass::vectorTypeName( type ) );
 
diff --git a/src/providers/grass/qgsgrassgislib.cpp b/src/providers/grass/qgsgrassgislib.cpp
index 66f2db90ef4..479491c2781 100644
--- a/src/providers/grass/qgsgrassgislib.cpp
+++ b/src/providers/grass/qgsgrassgislib.cpp
@@ -65,18 +65,10 @@ extern "C"
 }
 #endif
 
-#if !defined(GRASS_VERSION_MAJOR) || \
-    !defined(GRASS_VERSION_MINOR) || \
-    GRASS_VERSION_MAJOR<6 || \
-    (GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR <= 2)
-#define G__setenv(name,value) G__setenv( ( char * ) (name), (char *) (value) )
-#endif
-
 #ifdef Q_OS_WIN
 #include <windows.h>
 #endif
 
-
 QgsGrassGisLib *QgsGrassGisLib::_instance = 0;
 
 QgsGrassGisLib GRASS_LIB_EXPORT *QgsGrassGisLib::instance()
@@ -206,10 +198,6 @@ int GRASS_LIB_EXPORT QgsGrassGisLib::G__gisinit( const char *version, const char
 
   G_suppress_masking();
 
-#if GRASS_VERSION_MAJOR<6 || (GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR <= 4)
-  G__init_null_patterns();
-#endif
-
   // Read projection if set
   //mCrs.createFromOgcWmsCrs( "EPSG:900913" );
   QString crsStr = getenv( "QGIS_GRASS_CRS" );
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
index 3e2a91eb684..a9634c3c91d 100644
--- a/src/providers/grass/qgsgrassprovider.cpp
+++ b/src/providers/grass/qgsgrassprovider.cpp
@@ -63,12 +63,7 @@ extern "C"
 #include <grass/gprojects.h>
 #include <grass/gis.h>
 #include <grass/dbmi.h>
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
-#define BOUND_BOX bound_box
-#endif
 }
 
 #ifdef _MSC_VER
@@ -83,10 +78,6 @@ extern "C"
 // See: https://lists.osgeo.org/pipermail/grass-dev/2015-June/075539.html
 //      https://lists.osgeo.org/pipermail/grass-dev/2015-September/076338.html
 // TODO: get real off_t size from GRASS, probably contribute a patch which will save 'g.version -g' to a header file during compilation
-#if GRASS_VERSION_MAJOR < 7
-typedef int Vect_rewrite_line_function_type( struct Map_info *, int, int, struct line_pnts *, struct line_cats * );
-typedef int Vect_delete_line_function_type( struct Map_info *, int );
-#else
 #ifdef Q_OS_WIN
 typedef qint64 grass_off_t;
 #else
@@ -100,7 +91,6 @@ typedef off_t grass_off_t; // GRASS_OFF_T_SIZE undefined, default to off_t
 #endif
 typedef grass_off_t Vect_rewrite_line_function_type( struct Map_info *, grass_off_t, int, const struct line_pnts *, const struct line_cats * );
 typedef int Vect_delete_line_function_type( struct Map_info *, grass_off_t );
-#endif
 Vect_rewrite_line_function_type *Vect_rewrite_line_function_pointer = ( Vect_rewrite_line_function_type * )Vect_rewrite_line;
 Vect_delete_line_function_type *Vect_delete_line_function_pointer = ( Vect_delete_line_function_type * )Vect_delete_line;
 
@@ -265,11 +255,7 @@ QgsGrassProvider::QgsGrassProvider( const QString &uri )
   setNativeTypes( QList<NativeType>()
                   << QgsVectorDataProvider::NativeType( tr( "Whole number (integer)" ), QStringLiteral( "integer" ), QVariant::Int, -1, -1, -1, -1 )
                   << QgsVectorDataProvider::NativeType( tr( "Decimal number (real)" ), QStringLiteral( "double precision" ), QVariant::Double, -1, -1, -1, -1 )
-#if GRASS_VERSION_MAJOR < 7
-                  << QgsVectorDataProvider::NativeType( tr( "Text, limited variable length (varchar)" ), "varchar", QVariant::String, 1, 255, -1, -1 )
-#else
                   << QgsVectorDataProvider::NativeType( tr( "Text" ), QStringLiteral( "text" ), QVariant::String )
-#endif
                   // TODO:
                   // << QgsVectorDataProvider::NativeType( tr( "Date" ), "date", QVariant::Date, 8, 8 );
                 );
@@ -435,7 +421,7 @@ QgsRectangle QgsGrassProvider::extent() const
 {
   if ( isValid() )
   {
-    BOUND_BOX box;
+    bound_box box;
     Vect_get_map_box( map(), &box );
     return QgsRectangle( box.W, box.S, box.E, box.N );
   }
@@ -575,7 +561,7 @@ bool QgsGrassProvider::isGrassEditable( void )
     return false;
 
   /* Check if current user is owner of mapset */
-  if ( G__mapset_permissions2( mGrassObject.gisdbase().toUtf8().data(), mGrassObject.location().toUtf8().data(), mGrassObject.mapset().toUtf8().data() ) != 1 )
+  if ( G_mapset_permissions2( mGrassObject.gisdbase().toUtf8().data(), mGrassObject.location().toUtf8().data(), mGrassObject.mapset().toUtf8().data() ) != 1 )
     return false;
 
   // TODO: check format? (cannot edit OGR layers)
@@ -752,13 +738,9 @@ bool QgsGrassProvider::lineNodes( int line, int *node1, int *node2 )
     return false;
   }
 
-#if GRASS_VERSION_MAJOR < 7
-  Vect_get_line_nodes( map(), line, node1, node2 );
-#else
   /* points don't have topology in GRASS >= 7 */
   *node1 = 0;
   *node2 = 0;
-#endif
   return true;
 }
 
diff --git a/src/providers/grass/qgsgrassprovidermodule.cpp b/src/providers/grass/qgsgrassprovidermodule.cpp
index bf4be563dcb..19862d64917 100644
--- a/src/providers/grass/qgsgrassprovidermodule.cpp
+++ b/src/providers/grass/qgsgrassprovidermodule.cpp
@@ -525,10 +525,6 @@ QVector<QgsDataItem *> QgsGrassMapsetItem::createChildren()
     {
       topoError = tr( "topology version 6" );
     }
-    else if ( topoMinor == 1 &&  GRASS_VERSION_MAJOR < 7 )
-    {
-      topoError = tr( "topology version 7" );
-    }
 
     if ( !topoError.isEmpty() )
     {
diff --git a/src/providers/grass/qgsgrassrasterprovider.h b/src/providers/grass/qgsgrassrasterprovider.h
index e4af19d8717..97ac79798d4 100644
--- a/src/providers/grass/qgsgrassrasterprovider.h
+++ b/src/providers/grass/qgsgrassrasterprovider.h
@@ -30,9 +30,7 @@ extern "C"
 {
 #include <grass/version.h>
 #include <grass/gis.h>
-#if GRASS_VERSION_MAJOR > 6
 #include <grass/raster.h>
-#endif
 }
 
 #include <QString>
diff --git a/src/providers/grass/qgsgrassvector.cpp b/src/providers/grass/qgsgrassvector.cpp
index 5fbcfacafea..aaf2a11347c 100644
--- a/src/providers/grass/qgsgrassvector.cpp
+++ b/src/providers/grass/qgsgrassvector.cpp
@@ -32,13 +32,8 @@ extern "C"
 #undef M_PI_4 //avoid redefinition warning
 #endif
 #include <grass/gprojects.h>
-
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
 #include <grass/raster.h>
-#endif
 }
 
 QgsGrassVectorLayer::QgsGrassVectorLayer( QObject *parent )
diff --git a/src/providers/grass/qgsgrassvectormap.cpp b/src/providers/grass/qgsgrassvectormap.cpp
index f2fa421f382..d75f604f916 100644
--- a/src/providers/grass/qgsgrassvectormap.cpp
+++ b/src/providers/grass/qgsgrassvectormap.cpp
@@ -38,12 +38,7 @@ extern "C"
 #include <grass/gprojects.h>
 #include <grass/gis.h>
 #include <grass/dbmi.h>
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
-#define BOUND_BOX bound_box
-#endif
 }
 
 QgsGrassVectorMap::QgsGrassVectorMap( const QgsGrassObject &grassObject )
@@ -187,12 +182,7 @@ bool QgsGrassVectorMap::openMap()
   {
     G_TRY
     {
-#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \
-    ( ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 4 ) || GRASS_VERSION_MAJOR > 6 )
       Vect_build( mMap );
-#else
-      Vect_build( mMap, stderr );
-#endif
     }
     G_CATCH( QgsGrass::Exception & e )
     {
@@ -323,14 +313,8 @@ bool QgsGrassVectorMap::closeEdit( bool newMap )
   // Mapset must be set before Vect_close()
   QgsGrass::setMapset( mGrassObject.gisdbase(), mGrassObject.location(), mGrassObject.mapset() );
 
-#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \
-    ( ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 4 ) || GRASS_VERSION_MAJOR > 6 )
   Vect_build_partial( mMap, GV_BUILD_NONE );
   Vect_build( mMap );
-#else
-  Vect_build_partial( mMap, GV_BUILD_NONE, NULL );
-  Vect_build( mMap, stderr );
-#endif
 
   // TODO?
 #if 0
diff --git a/src/providers/grass/qgsgrassvectormaplayer.cpp b/src/providers/grass/qgsgrassvectormaplayer.cpp
index a79aba1e290..2941380e72a 100644
--- a/src/providers/grass/qgsgrassvectormaplayer.cpp
+++ b/src/providers/grass/qgsgrassvectormaplayer.cpp
@@ -33,12 +33,7 @@ extern "C"
 #include <grass/gprojects.h>
 #include <grass/gis.h>
 #include <grass/dbmi.h>
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
-#define BOUND_BOX bound_box
-#endif
 }
 
 QgsGrassVectorMapLayer::QgsGrassVectorMapLayer( QgsGrassVectorMap *map, int field )
diff --git a/src/providers/grass/qgsgrassvectormaplayer.h b/src/providers/grass/qgsgrassvectormaplayer.h
index 40d7fec2098..c930050d62e 100644
--- a/src/providers/grass/qgsgrassvectormaplayer.h
+++ b/src/providers/grass/qgsgrassvectormaplayer.h
@@ -35,12 +35,7 @@ extern "C"
 #include <grass/gprojects.h>
 #include <grass/gis.h>
 #include <grass/dbmi.h>
-#if GRASS_VERSION_MAJOR < 7
-#include <grass/Vect.h>
-#else
 #include <grass/vector.h>
-#define BOUND_BOX bound_box
-#endif
 }
 
 class QgsGrassVectorMap;
diff --git a/tests/src/providers/grass/testqgsgrassprovider.cpp b/tests/src/providers/grass/testqgsgrassprovider.cpp
index 6154e6e4b5c..320c45dc242 100644
--- a/tests/src/providers/grass/testqgsgrassprovider.cpp
+++ b/tests/src/providers/grass/testqgsgrassprovider.cpp
@@ -1628,7 +1628,6 @@ bool TestQgsGrassProvider::compare( QString uri, QgsVectorLayer *expectedLayer,
   // We cannot test attribute table changes with independent layer in GRASS 6, which is using
   // DBF files, which are written when driver is closed (map layer keeps driver open during editing)
   bool independentOk = true;
-#if GRASS_VERSION_MAJOR >= 7
   // Open an independent layer which does not share data with edited one
   // build topology
   G_TRY
@@ -1644,11 +1643,9 @@ bool TestQgsGrassProvider::compare( QString uri, QgsVectorLayer *expectedLayer,
       throw QgsGrass::Exception( "Cannot open map " + mapObject.name() );
     }
 
-#if ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 4 ) || GRASS_VERSION_MAJOR > 6
+
     Vect_build( map );
-#else
-    Vect_build( map, stderr );
-#endif
+
     //Vect_set_release_support( map );
     Vect_close( map );
     QgsGrass::vectDestroyMapStruct( map );
@@ -1684,7 +1681,6 @@ bool TestQgsGrassProvider::compare( QString uri, QgsVectorLayer *expectedLayer,
   {
     reportRow( QStringLiteral( "comparison with independent layer failed" ) );
   }
-#endif // GRASS_VERSION_MAJOR >= 7
 
   return sharedOk && independentOk;
 }