diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java
index 2bd9d01..9939364 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/DryWeatherScreening.java
@@ -44,14 +44,6 @@ public class DryWeatherScreening extends AppCompatActivity{
     boolean needMaintenance = false;
     boolean screenOK = false;
 
-
-    //I assume onCreate is important so I will leave it unchanged
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_sample_fordm);
-        recyclerView =  findViewById(R.id.recyclerView2);
-        setupForm();
-    }
     private void setupForm() {
         formBuilder = new FormBuilder(this, recyclerView);
         FormHeader title = (FormHeader) new FormHeader().setTitle("Dry Weather Screening");
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java
index 5c9e19c..7adc3cb 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java
@@ -25,7 +25,7 @@
 import me.riddhimanadib.formmaster.model.FormElementTextSingleLine;
 import me.riddhimanadib.formmaster.model.FormHeader;
 
-public class General {
+public class General extends AppCompatActivity{
     //HQ form
     private FormBuilder formBuilder;
     private RecyclerView recyclerView;
@@ -43,22 +43,8 @@ public class General {
     String pipeSize = "";
     String channelBottomWidth = "";
     String receivingWater = "";
-    String routineEvaluation = "";
-    String complaintInvestigation = "";
-
-    String comments = "";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_sample_fordm);
-        recyclerView =  findViewById(R.id.recyclerView2);
-        setupForm();
-    }
 
     private void setupForm() {
-        formBuilder = new FormBuilder(this, recyclerView);
-
         FormHeader title = (FormHeader) new FormHeader().setTitle("Report");
 
         FormElementTextSingleLine name = FormElementTextSingleLine.createInstance().setTitle("Name of Inspector").setValue("");
@@ -103,7 +89,7 @@ private void setupForm() {
         FormElementPickerMulti pipeSizeValue = FormElementPickerMulti.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions);
         pipeSize = pipeSizeValue.getValue();
 
-        List<String> channelWidthOptions = new ArrayList<String;
+        List<String> channelWidthOptions = new ArrayList<String>();
         channelWidthOptions.add("2\"");
         channelWidthOptions.add("4\"");
         channelWidthOptions.add("6\"");
@@ -131,15 +117,6 @@ private void setupForm() {
 
         FormElementPickerMulti receiving = FormElementPickerMulti.createInstance().setTitle("Receiving Water").setOptions(receivingWaterOptions);
         receivingWater = receiving.getValue();
-        /*
-        FormElementTextSingleLine routine = FormElementTextSingleLine.createInstance().setTitle("Routine Evaluation").setValue("");
-        routineEvaluation = routine.getValue();
-
-        FormElementTextSingleLine complaint = FormElementTextSingleLine.createInstance().setTitle("Complaint Investigation").setValue("");
-        complaintInvestigation = complaint.getValue();
-
-        FormElementTextSingleLine commentsValue = FormElementTextSingleLine.createInstance().setTitle("Comments").setValue("");
-        comments = commentsValue.getValue();*/
     }
 
     public String getName() {
@@ -186,15 +163,4 @@ public String getReceivingWater() {
         return receivingWater;
     }
 
-    /*public String getRoutineEvaluation() {
-        return routineEvaluation;
-    }
-
-    public String getComplaintInvestigation() {
-        return complaintInvestigation;
-    }
-
-    public String getComments() {
-        return comments;
-    }*/
 }