removed stubs for merge

src/Handler/Utils/Form.hs

@@ -222,7 +222,7 @@ studyFeaturesPrimaryFieldFor uid = selectField $ do
         E.on     $ feature E.^. StudyFeaturesField  E.==. field  E.^. StudyTermsId
         E.on     $ feature E.^. StudyFeaturesDegree E.==. degree E.^. StudyDegreeId
         E.where_ $ feature E.^. StudyFeaturesUser   E.==. E.val uid
-        -- E.where_ $ feature E.^. StudyFeaturesValid  E.==. E.val True -- TODO SJ REMOVE
+        E.where_ $ feature E.^. StudyFeaturesValid  E.==. E.val True 
         E.where_ $ feature E.^. StudyFeaturesType   E.==. E.val FieldPrimary
         return (feature E.^. StudyFeaturesId, degree, field)
     mkOptionList <$> mapM procOptions rawOptions

src/Handler/Utils/StudyFeatures.hs

@@ -18,7 +18,6 @@ pStudyFeatures studyFeaturesUser studyFeaturesUpdated = do
   void $ string "$$"
 
   let
-    studyFeaturesUpdated = error "undefined" --TODO SJ REMOVE
     pStudyFeature = do
       _ <- pKey -- Meaning unknown at this time
       void $ char '!'
@@ -33,7 +32,7 @@ pStudyFeatures studyFeaturesUser studyFeaturesUpdated = do
       return StudyFeatures{..}
 
   pStudyFeature `sepBy1` char '#'
-
+  
 pKey :: Parser Int
 pKey = decimal