diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicCreatePolygonFeature.cpp b/ApplicationLibCode/Commands/PolygonCommands/RicCreatePolygonFeature.cpp
index 1b4770b9ee..6bd9c7987c 100644
--- a/ApplicationLibCode/Commands/PolygonCommands/RicCreatePolygonFeature.cpp
+++ b/ApplicationLibCode/Commands/PolygonCommands/RicCreatePolygonFeature.cpp
@@ -24,8 +24,7 @@
 #include "Polygons/RimPolygonCollection.h"
 #include "Polygons/RimPolygonTools.h"
 #include "Rim3dView.h"
-#include "RimOilField.h"
-#include "RimProject.h"
+#include "RimTools.h"
 
 #include "Riu3DMainWindowTools.h"
 
@@ -38,8 +37,7 @@ CAF_CMD_SOURCE_INIT( RicCreatePolygonFeature, "RicCreatePolygonFeature" );
 //--------------------------------------------------------------------------------------------------
 void RicCreatePolygonFeature::onActionTriggered( bool isChecked )
 {
-    auto proj              = RimProject::current();
-    auto polygonCollection = proj->activeOilField()->polygonCollection();
+    auto polygonCollection = RimTools::polygonCollection();
 
     auto newPolygon = polygonCollection->appendUserDefinedPolygon();
     polygonCollection->uiCapability()->updateAllRequiredEditors();
diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicDeleteAllPolygonsFeature.cpp b/ApplicationLibCode/Commands/PolygonCommands/RicDeleteAllPolygonsFeature.cpp
index 4353aeb84f..a4bb9040ac 100644
--- a/ApplicationLibCode/Commands/PolygonCommands/RicDeleteAllPolygonsFeature.cpp
+++ b/ApplicationLibCode/Commands/PolygonCommands/RicDeleteAllPolygonsFeature.cpp
@@ -19,8 +19,7 @@
 #include "RicDeleteAllPolygonsFeature.h"
 
 #include "Polygons/RimPolygonCollection.h"
-#include "RimOilField.h"
-#include "RimProject.h"
+#include "RimTools.h"
 
 #include <QAction>
 
@@ -31,8 +30,7 @@ CAF_CMD_SOURCE_INIT( RicDeleteAllPolygonsFeature, "RicDeleteAllPolygonsFeature"
 //--------------------------------------------------------------------------------------------------
 void RicDeleteAllPolygonsFeature::onActionTriggered( bool isChecked )
 {
-    auto proj              = RimProject::current();
-    auto polygonCollection = proj->activeOilField()->polygonCollection();
+    auto polygonCollection = RimTools::polygonCollection();
 
     polygonCollection->deleteAllPolygons();
     polygonCollection->updateConnectedEditors();
diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicDuplicatePolygonFeature.cpp b/ApplicationLibCode/Commands/PolygonCommands/RicDuplicatePolygonFeature.cpp
index 8da3c923f7..6bc6761f26 100644
--- a/ApplicationLibCode/Commands/PolygonCommands/RicDuplicatePolygonFeature.cpp
+++ b/ApplicationLibCode/Commands/PolygonCommands/RicDuplicatePolygonFeature.cpp
@@ -25,8 +25,7 @@
 #include "Polygons/RimPolygonInView.h"
 #include "Polygons/RimPolygonTools.h"
 #include "Rim3dView.h"
-#include "RimOilField.h"
-#include "RimProject.h"
+#include "RimTools.h"
 
 #include "Riu3DMainWindowTools.h"
 
@@ -55,8 +54,7 @@ void RicDuplicatePolygonFeature::onActionTriggered( bool isChecked )
 
     auto sourcePolygon = selPolygons[0];
 
-    auto proj              = RimProject::current();
-    auto polygonCollection = proj->activeOilField()->polygonCollection();
+    auto polygonCollection = RimTools::polygonCollection();
 
     auto newPolygon = polygonCollection->createUserDefinedPolygon();
     newPolygon->setPointsInDomainCoords( sourcePolygon->pointsInDomainCoords() );
diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicImportPolygonFileFeature.cpp b/ApplicationLibCode/Commands/PolygonCommands/RicImportPolygonFileFeature.cpp
index f4f1ffc8ed..ca49b3e548 100644
--- a/ApplicationLibCode/Commands/PolygonCommands/RicImportPolygonFileFeature.cpp
+++ b/ApplicationLibCode/Commands/PolygonCommands/RicImportPolygonFileFeature.cpp
@@ -24,8 +24,7 @@
 #include "Polygons/RimPolygonCollection.h"
 #include "Polygons/RimPolygonFile.h"
 #include "Polygons/RimPolygonTools.h"
-#include "RimOilField.h"
-#include "RimProject.h"
+#include "RimTools.h"
 
 #include "Riu3DMainWindowTools.h"
 #include "RiuFileDialogTools.h"
@@ -56,8 +55,7 @@ void RicImportPolygonFileFeature::onActionTriggered( bool isChecked )
     // Remember the path to next time
     app->setLastUsedDialogDirectory( RimPolygonTools::polygonCacheName(), QFileInfo( fileNames.last() ).absolutePath() );
 
-    auto proj              = RimProject::current();
-    auto polygonCollection = proj->activeOilField()->polygonCollection();
+    auto polygonCollection = RimTools::polygonCollection();
 
     RimPolygon* objectToSelect = nullptr;
 
diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp
index 008d27940a..091b81c3d2 100644
--- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp
@@ -25,12 +25,11 @@
 #include "RimAnnotationInViewCollection.h"
 #include "RimAnnotationLineAppearance.h"
 #include "RimGridView.h"
-#include "RimOilField.h"
 #include "RimPolylineTarget.h"
 #include "RimPolylinesFromFileAnnotation.h"
-#include "RimProject.h"
 #include "RimReachCircleAnnotation.h"
 #include "RimTextAnnotation.h"
+#include "RimTools.h"
 #include "RimUserDefinedPolylinesAnnotation.h"
 
 #include "Polygons/RimPolygon.h"
@@ -79,7 +78,7 @@ RimAnnotationCollection::~RimAnnotationCollection()
 //--------------------------------------------------------------------------------------------------
 void RimAnnotationCollection::initAfterRead()
 {
-    auto polycoll = RimProject::current()->activeOilField()->polygonCollection();
+    auto polycoll = RimTools::polygonCollection();
 
     for ( auto oldPolyObj : m_userDefinedPolylineAnnotations_OBSOLETE->annotations() )
     {
diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp
index 85aab33aa8..ce97676812 100644
--- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp
@@ -24,9 +24,9 @@
 #include "RimCellFilter.h"
 #include "RimCellIndexFilter.h"
 #include "RimCellRangeFilter.h"
-#include "RimOilField.h"
 #include "RimPolygonFilter.h"
 #include "RimProject.h"
+#include "RimTools.h"
 #include "RimUserDefinedFilter.h"
 #include "RimUserDefinedIndexFilter.h"
 #include "RimViewController.h"
@@ -144,8 +144,7 @@ void RimCellFilterCollection::appendMenuItems( caf::CmdFeatureMenuBuilder& menuB
 
     menuBuilder.subMenuStart( "Polygon Filter", QIcon( ":/CellFilter_Polygon.png" ) );
     {
-        auto project           = RimProject::current();
-        auto polygonCollection = project->activeOilField()->polygonCollection();
+        auto polygonCollection = RimTools::polygonCollection();
         for ( auto p : polygonCollection->allPolygons() )
         {
             if ( !p ) continue;
diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp
index d6ec895e16..989fea936f 100644
--- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp
+++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp
@@ -44,8 +44,6 @@
 #include "RimEclipseCaseEnsemble.h"
 #include "RimEclipseContourMapProjection.h"
 #include "RimEclipseResultDefinition.h"
-#include "RimOilField.h"
-#include "RimProject.h"
 #include "RimSimWellInViewCollection.h"
 #include "RimStatisticsContourMapProjection.h"
 #include "RimStatisticsContourMapView.h"
@@ -213,8 +211,7 @@ void RimStatisticsContourMap::defineUiOrdering( QString uiConfigName, caf::PdmUi
         if ( m_enableFormationFilter ) formationGrp->add( &m_selectedFormations );
     }
 
-    RimProject* proj = RimProject::current();
-    if ( auto polygonCollection = proj->activeOilField()->polygonCollection().p() )
+    if ( auto polygonCollection = RimTools::polygonCollection() )
     {
         if ( !polygonCollection->allPolygons().empty() )
         {
@@ -389,8 +386,7 @@ QList<caf::PdmOptionItemInfo> RimStatisticsContourMap::calculateValueOptions( co
     }
     else if ( &m_selectedPolygons == fieldNeedingOptions )
     {
-        RimProject* proj = RimProject::current();
-        if ( auto polygonCollection = proj->activeOilField()->polygonCollection().p() )
+        if ( auto polygonCollection = RimTools::polygonCollection() )
         {
             for ( auto p : polygonCollection->allPolygons() )
             {
diff --git a/ApplicationLibCode/ProjectDataModel/RimTools.cpp b/ApplicationLibCode/ProjectDataModel/RimTools.cpp
index 47c6e8d9a3..cda1909511 100644
--- a/ApplicationLibCode/ProjectDataModel/RimTools.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimTools.cpp
@@ -558,8 +558,7 @@ RimWellPath* RimTools::firstWellPath()
 //--------------------------------------------------------------------------------------------------
 RimSurfaceCollection* RimTools::surfaceCollection()
 {
-    RimProject* proj = RimProject::current();
-    return proj->activeOilField()->surfaceCollection();
+    return RimProject::current()->activeOilField()->surfaceCollection();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -567,8 +566,7 @@ RimSurfaceCollection* RimTools::surfaceCollection()
 //--------------------------------------------------------------------------------------------------
 RimPolygonCollection* RimTools::polygonCollection()
 {
-    RimProject* proj = RimProject::current();
-    return proj->activeOilField()->polygonCollection();
+    return RimProject::current()->activeOilField()->polygonCollection();
 }
 
 //--------------------------------------------------------------------------------------------------