diff --git a/build.gradle b/build.gradle
index 4d3a7e424f..75953d29c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,8 +54,8 @@ ext {
             buildToolsVersion: "25.0.2",
             minSdkVersion    : 15,
             targetSdkVersion : 25,
-            versionCode      : 42_1,
-            versionName      : "0.4.2.1-SNAPSHOT"
+            versionCode      : 42_2,
+            versionName      : "0.4.2.2-SNAPSHOT"
     ]
 
     libraries = [
diff --git a/core/src/main/java/org/hisp/dhis/android/core/data/database/DbOpenHelper.java b/core/src/main/java/org/hisp/dhis/android/core/data/database/DbOpenHelper.java
index 95bf067c7d..e3be892340 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/data/database/DbOpenHelper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/data/database/DbOpenHelper.java
@@ -701,6 +701,7 @@ public class DbOpenHelper extends CustomSQLBriteOpenHelper {
             " ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED" +
             ");";
 
+    //TODO We need to review the constrain between dataelement and trackedentitydatavalue
     private static final String CREATE_TRACKED_ENTITY_DATA_VALUE_TABLE = "CREATE TABLE " +
             TrackedEntityDataValueModel.TABLE + " (" +
             TrackedEntityDataValueModel.Columns.ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
@@ -711,10 +712,10 @@ public class DbOpenHelper extends CustomSQLBriteOpenHelper {
             TrackedEntityDataValueModel.Columns.CREATED + " TEXT," +
             TrackedEntityDataValueModel.Columns.LAST_UPDATED + " TEXT," +
             TrackedEntityDataValueModel.Columns.PROVIDED_ELSEWHERE + " INTEGER," +
-            " FOREIGN KEY (" + TrackedEntityDataValueModel.Columns.DATA_ELEMENT + ")" +
+            /*" FOREIGN KEY (" + TrackedEntityDataValueModel.Columns.DATA_ELEMENT + ")" +
             " REFERENCES " + DataElementModel.TABLE +
             " (" + DataElementModel.Columns.UID + ")" +
-            " ON DELETE CASCADE, " +
+            " ON DELETE CASCADE, " +*/
             " FOREIGN KEY (" + TrackedEntityDataValueModel.Columns.EVENT + ")" +
             " REFERENCES " + EventModel.TABLE + " (" + EventModel.Columns.UID + ")" +
             " ON DELETE CASCADE" +
diff --git a/gradle.properties b/gradle.properties
index 1dbc4fccae..c3472c8369 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,8 +12,8 @@ org.gradle.jvmargs=-Xmx1536m
 # Properties which are consumed by plugins/gradle-mvn-push.gradle plugin.
 # They are used for publishing artifact to snapshot repository.
 
-VERSION_NAME=0.4.2.1-SNAPSHOT
-VERSION_CODE=42_1
+VERSION_NAME=0.4.2.2-SNAPSHOT
+VERSION_CODE=42_2
 GROUP=org.hisp.dhis
 
 POM_DESCRIPTION=Android SDK for DHIS 2.