diff --git a/modules/scraml-dsl-java/src/main/java/io/atomicbits/scraml/dsl/java/NonNull.java b/modules/scraml-dsl-java/src/main/java/io/atomicbits/scraml/dsl/java/NonNull.java
deleted file mode 100644
index a1b45eb..0000000
--- a/modules/scraml-dsl-java/src/main/java/io/atomicbits/scraml/dsl/java/NonNull.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- *  (C) Copyright 2015 Atomic BITS (http://atomicbits.io).
- *
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the GNU Affero General Public License
- *  (AGPL) version 3.0 which accompanies this distribution, and is available in
- *  the LICENSE file or at http://www.gnu.org/licenses/agpl-3.0.en.html
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *  Affero General Public License for more details.
- *
- *  Contributors:
- *      Peter Rigole
- *
- */
-
-package io.atomicbits.scraml.dsl.java;
-
-/**
- * Created by peter on 19/02/16.
- */
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Documented
-@Retention(RetentionPolicy.CLASS)
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
-public @interface NonNull {
-}
diff --git a/modules/scraml-dsl-java/src/main/java/io/atomicbits/scraml/dsl/java/client/ning/Ning19ClientFactory.java b/modules/scraml-dsl-java/src/main/java/io/atomicbits/scraml/dsl/java/client/ning/Ning19ClientFactory.java
index e4fcd63..b807190 100644
--- a/modules/scraml-dsl-java/src/main/java/io/atomicbits/scraml/dsl/java/client/ning/Ning19ClientFactory.java
+++ b/modules/scraml-dsl-java/src/main/java/io/atomicbits/scraml/dsl/java/client/ning/Ning19ClientFactory.java
@@ -20,7 +20,6 @@
 package io.atomicbits.scraml.dsl.java.client.ning;
 
 import io.atomicbits.scraml.dsl.java.Client;
-import io.atomicbits.scraml.dsl.java.NonNull;
 import io.atomicbits.scraml.dsl.java.client.ClientConfig;
 import io.atomicbits.scraml.dsl.java.client.ClientFactory;
 
diff --git a/modules/scraml-generator/src/main/scala/io/atomicbits/scraml/generator/codegen/PojoGenerator.scala b/modules/scraml-generator/src/main/scala/io/atomicbits/scraml/generator/codegen/PojoGenerator.scala
index 4b95cdd..d65ee60 100644
--- a/modules/scraml-generator/src/main/scala/io/atomicbits/scraml/generator/codegen/PojoGenerator.scala
+++ b/modules/scraml-generator/src/main/scala/io/atomicbits/scraml/generator/codegen/PojoGenerator.scala
@@ -87,7 +87,6 @@ object PojoGenerator {
         package ${topLevelClass.packageName};
 
         import com.fasterxml.jackson.annotation.*;
-        import io.atomicbits.scraml.dsl.java.NonNull;
 
         ${topLevelImports.mkString("", ";\n", ";")};
 
@@ -130,7 +129,6 @@ object PojoGenerator {
         package ${classRep.packageName};
 
         import com.fasterxml.jackson.annotation.*;
-        import io.atomicbits.scraml.dsl.java.NonNull;
 
         public enum ${classRep.name} {
 
@@ -179,7 +177,6 @@ object PojoGenerator {
 
         import java.util.*;
         import com.fasterxml.jackson.annotation.*;
-        import io.atomicbits.scraml.dsl.java.NonNull;
 
         ${generatePojoSource(classRep, parentClassRep, skipField)}
      """
@@ -216,7 +213,7 @@ object PojoGenerator {
              return ${fieldRep.safeFieldNameJava};
            }
 
-           public void set$fieldNameCap(${fieldRep.fieldExpressionJavaNonNulMarked}) {
+           public void set$fieldNameCap(${classPointer.classDefinitionJava} ${fieldRep.safeFieldNameJava}) {
              this.${fieldRep.safeFieldNameJava} = ${fieldRep.safeFieldNameJava};
            }
 
@@ -235,7 +232,7 @@ object PojoGenerator {
       s"this.set$fieldNameCap(${sf.safeFieldNameJava});"
     }
 
-    val fieldExpressions = fieldsWithParentFields.map(_.fieldExpressionJavaNonNulMarked)
+    val fieldExpressions = fieldsWithParentFields.map(_.fieldExpressionJava)
 
     val fieldConstructor =
       if (fieldExpressions.nonEmpty)
diff --git a/modules/scraml-generator/src/main/scala/io/atomicbits/scraml/generator/model/ClassRep.scala b/modules/scraml-generator/src/main/scala/io/atomicbits/scraml/generator/model/ClassRep.scala
index 976eef4..972d202 100644
--- a/modules/scraml-generator/src/main/scala/io/atomicbits/scraml/generator/model/ClassRep.scala
+++ b/modules/scraml-generator/src/main/scala/io/atomicbits/scraml/generator/model/ClassRep.scala
@@ -171,11 +171,6 @@ case class Field(fieldName: String, classPointer: ClassPointer, required: Boolea
 
   def fieldExpressionJava: String = s"${classPointer.classDefinitionJava} $safeFieldNameJava"
 
-  def fieldExpressionJavaNonNulMarked: String = {
-    val nonNullMarker = if(required) "@NonNull " else ""
-    s"$nonNullMarker${classPointer.classDefinitionJava} $safeFieldNameJava"
-  }
-
   lazy val safeFieldNameJava: String = {
 
     val cleanName = CleanNameUtil.cleanFieldName(fieldName)