Clean up shutdown and risk

@@ -14,11 +14,7 @@
 @prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
 
 :     rdf:type owl:Ontology ;
-      owl:imports ILAP: , <http://data.posccaesar.org/ilap/refdata/NORSOK/Z-014/SCCS> .
-
-:RiskFactor_1
-      rdf:type ILAP:RiskFactor ;
-      rdfs:label "Risk factor 1"^^xsd:string .
+      owl:imports <http://data.posccaesar.org/ilap/refdata/NORSOK/Z-014/SCCS> , ILAP: .
 
 ILAP:
       rdf:type owl:Ontology ;
@@ -114,8 +110,8 @@ ILAP:DG7
       rdfs:label "DG7"^^xsd:string .
 
 ILAP:Development
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
-      rdfs:label "Development"^^xsd:string , "Develop"^^xsd:string .
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
+      rdfs:label "Develop"^^xsd:string , "Development"^^xsd:string .
 
 ILAP:DisasterRecovery
       rdf:type ILAP:PlanObjectiveType ;
@@ -130,7 +126,7 @@ ILAP:DrillingAndWell
       rdfs:label "Drilling and well"^^xsd:string .
 
 ILAP:Exploration
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
       rdfs:label "Exploration"^^xsd:string .
 
 ILAP:Facility
@@ -242,7 +238,7 @@ ILAP:OPEX
       rdfs:label "OPEX"^^xsd:string .
 
 ILAP:Operation
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
       rdfs:label "Operation"^^xsd:string .
 
 ILAP:OperationAndMaintenance
@@ -264,7 +260,7 @@ ILAP:PlannedActivity_1
               ILAP:ActivityWBS_1 .
 
 ILAP:Planning
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
       rdfs:label "Planning"^^xsd:string .
 
 ILAP:Primavera
@@ -292,7 +288,7 @@ ILAP:Released
       rdfs:label "Released"^^xsd:string .
 
 ILAP:Removal
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
       rdfs:label "Removal"^^xsd:string .
 
 ILAP:Renewal
@@ -328,14 +324,14 @@ ILAP:Scheduled
       rdfs:label "Scheduled"^^xsd:string .
 
 ILAP:ShutdownAndDecommisioning
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
       rdfs:label "Shutdown and decommisioning"^^xsd:string .
 
 ILAP:StandardFreeWeekendPeriod
       rdf:type ILAP:CalendarFreePeriodWeekRepeat ;
       rdfs:label "Standard free weekend period"^^xsd:string ;
       ILAP:hasCalendarPeriodFreeDay
-              ILAP:Saturday , ILAP:Sunday .
+              ILAP:Sunday , ILAP:Saturday .
 
 ILAP:StandardWorkWeekdayPeriod
       rdf:type ILAP:CalendarWorkPeriodWeekRepeat ;
@@ -452,12 +448,12 @@ ILAP:hasWorkTaskResponsible
 <http://data.posccaesar.org/npd/ontology/ilap-interface/Facility>
       rdf:type owl:Class ;
       rdfs:label "Facility"^^xsd:string ;
-      rdfs:subClassOf owl:Thing , ILAP:Facility .
+      rdfs:subClassOf ILAP:Facility , owl:Thing .
 
 <http://data.posccaesar.org/rdl/RDS282149>
       rdf:type owl:Class ;
       rdfs:label "RDS282149"^^xsd:string ;
-      rdfs:subClassOf owl:Thing , ILAP:ResponsibleOrganization .
+      rdfs:subClassOf ILAP:ResponsibleOrganization , owl:Thing .
 
 <http://www.ilap.no/codes/NORSOK/Z-014/CORCoding#A>
       rdfs:subClassOf <http://data.posccaesar.org/sccs/CORcode> .

@@ -20,24 +20,9 @@ UC1:ScheduledResource_1
       rdf:type ILAP:ScheduledResource ;
       rdfs:label "Scheduled resource 1"^^xsd:string .
 
-UC1:Shutdown_2
-      rdf:type ILAP:Shutdown ;
-      rdfs:label "Shutdown 2"^^xsd:string ;
-      ILAP:hasShutdownContent
-              ILAP:Equipment_Shutdown ;
-      ILAP:hasShutdownPeriod
-              "SD-2015"^^xsd:string ;
-      ILAP:hasShutdownType
-              ILAP:Scheduled_Shutdown .
-
 ILAP:PlannedActivity_1
       ILAP:hasActivityPlan
               UC1:ProjectPlan_1 .
 
-ILAP:hasShutdownPeriod
-      rdf:type owl:DatatypeProperty ;
-      rdfs:label "has shutdown period"^^xsd:string ;
-      rdfs:range xsd:string .
-
 ILAP:hasShutdownType
       rdfs:range ILAP:ShutdownType .