diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index c20622f8f3..296df7ccb0 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3493,10 +3493,6 @@ bool Application::isServerlessMode() const {
     return false;
 }
 
-bool Application::isInterstitialMode() const {
-    return _interstitialMode;
-}
-
 void Application::setIsInterstitialMode(bool interstitialMode) {
     if (_interstitialMode != interstitialMode) {
         _interstitialMode = interstitialMode;
diff --git a/interface/src/Application.h b/interface/src/Application.h
index c82dae3b05..de02b7f140 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -310,7 +310,7 @@ public:
     void saveNextPhysicsStats(QString filename);
 
     bool isServerlessMode() const;
-    bool isInterstitialMode() const;
+    bool isInterstitialMode() const { return _interstitialMode; }
 
     void replaceDomainContent(const QString& url);
 
diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp
index e670153a77..a456958108 100644
--- a/interface/src/octree/OctreePacketProcessor.cpp
+++ b/interface/src/octree/OctreePacketProcessor.cpp
@@ -136,12 +136,4 @@ void OctreePacketProcessor::startEntitySequence() {
 
 bool OctreePacketProcessor::isLoadSequenceComplete() const {
     return _safeLanding->isLoadSequenceComplete();
-}
-
-bool OctreePacketProcessor::isEntitiesRenderReady() const {
-    return _safeLanding->entitiesRenderReady();
-}
-
-float OctreePacketProcessor::domainLoadingProgress() {
-    return _safeLanding->loadingProgressPercentage();
-}
+}
\ No newline at end of file
diff --git a/interface/src/octree/OctreePacketProcessor.h b/interface/src/octree/OctreePacketProcessor.h
index 71e22bf240..3aa23c49f3 100644
--- a/interface/src/octree/OctreePacketProcessor.h
+++ b/interface/src/octree/OctreePacketProcessor.h
@@ -27,8 +27,8 @@ public:
 
     void startEntitySequence();
     bool isLoadSequenceComplete() const;
-    bool isEntitiesRenderReady() const;
-    float domainLoadingProgress();
+    bool isEntitiesRenderReady() const { return _safeLanding->entitiesRenderReady(); }
+    float domainLoadingProgress() { return _safeLanding->loadingProgressPercentage(); }
 
 signals:
     void packetVersionMismatch();
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 1244cd8828..824e0d4515 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -48,7 +48,6 @@ QString AddressManager::getProtocol() const {
 QUrl AddressManager::currentAddress(bool domainOnly) const {
     QUrl hifiURL = _domainURL;
 
-
     if (!domainOnly && hifiURL.scheme() == URL_SCHEME_HIFI) {
         hifiURL.setPath(currentPath());
     }
@@ -155,7 +154,8 @@ void AddressManager::goForward() {
 
 void AddressManager::goToLastAddress() {
     // this should always return something as long as the URL isn't empty.
-    handleUrl(_lastVisitedURL, LookupTrigger::AttemptedRefresh);
+    handleUrl(_lastVisitedURL,
+        LookupTrigger::AttemptedRefresh);
 }
 
 void AddressManager::storeCurrentAddress() {
diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h
index 7226e92451..e27504fc3a 100644
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@@ -149,7 +149,6 @@ public:
         UserInput,
         Back,
         Forward,
-        //Retry,
         StartupFromSettings,
         DomainPathResponse,
         Internal,