diff --git a/agent/agent.go b/agent/agent.go
index 549b404..40847dc 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package agent
 
 import (
diff --git a/agent/backend/backend.go b/agent/backend/backend.go
index 0451006..cdfafdd 100644
--- a/agent/backend/backend.go
+++ b/agent/backend/backend.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package backend
 
 import (
diff --git a/agent/backend/pktvisor/pktvisor.go b/agent/backend/pktvisor/pktvisor.go
index e2a826e..6559a61 100644
--- a/agent/backend/pktvisor/pktvisor.go
+++ b/agent/backend/pktvisor/pktvisor.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package pktvisor
 
 import (
diff --git a/agent/backend/pktvisor/policy.go b/agent/backend/pktvisor/policy.go
index 321d1e3..292ec14 100644
--- a/agent/backend/pktvisor/policy.go
+++ b/agent/backend/pktvisor/policy.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package pktvisor
 
 import (
diff --git a/agent/backend/pktvisor/scrape.go b/agent/backend/pktvisor/scrape.go
index b2dfb39..1655d2a 100644
--- a/agent/backend/pktvisor/scrape.go
+++ b/agent/backend/pktvisor/scrape.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package pktvisor
 
 import (
diff --git a/agent/backend/pktvisor/utils.go b/agent/backend/pktvisor/utils.go
index 779b4c9..b4be689 100644
--- a/agent/backend/pktvisor/utils.go
+++ b/agent/backend/pktvisor/utils.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package pktvisor
 
 import (
diff --git a/agent/cloud_config/cloud_config.go b/agent/cloud_config/cloud_config.go
index 9924e32..2f78390 100644
--- a/agent/cloud_config/cloud_config.go
+++ b/agent/cloud_config/cloud_config.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package cloud_config
 
 import (
diff --git a/agent/comms.go b/agent/comms.go
index 4efbb67..13d4b8f 100644
--- a/agent/comms.go
+++ b/agent/comms.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package agent
 
 import (
diff --git a/agent/config/types.go b/agent/config/types.go
index 962dbd0..04ab9ef 100644
--- a/agent/config/types.go
+++ b/agent/config/types.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package config
 
 type TLS struct {
diff --git a/agent/heartbeats.go b/agent/heartbeats.go
index 502ffb2..92bed17 100644
--- a/agent/heartbeats.go
+++ b/agent/heartbeats.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package agent
 
 import (
diff --git a/agent/logging.go b/agent/logging.go
index 8a7d641..37bd5ed 100644
--- a/agent/logging.go
+++ b/agent/logging.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package agent
 
 import (
diff --git a/agent/policies/repo.go b/agent/policies/repo.go
index 3c805de..7bc1a43 100644
--- a/agent/policies/repo.go
+++ b/agent/policies/repo.go
@@ -1,11 +1,8 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package policies
 
 import (
 	"errors"
+
 	"go.uber.org/zap"
 )
 
diff --git a/agent/policies/types.go b/agent/policies/types.go
index 62565ad..70c0b13 100644
--- a/agent/policies/types.go
+++ b/agent/policies/types.go
@@ -1,13 +1,10 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package policies
 
 import (
 	"database/sql/driver"
-	_ "github.com/mattn/go-sqlite3"
 	"time"
+
+	_ "github.com/mattn/go-sqlite3"
 )
 
 type PolicyData struct {
diff --git a/agent/policyMgr/manager.go b/agent/policyMgr/manager.go
index b72b8d1..3eff5e4 100644
--- a/agent/policyMgr/manager.go
+++ b/agent/policyMgr/manager.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package manager
 
 import (
diff --git a/agent/rpc_from.go b/agent/rpc_from.go
index ed2176e..339fb94 100644
--- a/agent/rpc_from.go
+++ b/agent/rpc_from.go
@@ -1,14 +1,11 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package agent
 
 import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/eclipse/paho.mqtt.golang"
+
+	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"github.com/orb-community/orb/fleet"
 	"go.uber.org/zap"
 )
diff --git a/agent/rpc_to.go b/agent/rpc_to.go
index f2d50be..aa192a4 100644
--- a/agent/rpc_to.go
+++ b/agent/rpc_to.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package agent
 
 import (
diff --git a/buildinfo/version.go b/buildinfo/version.go
index 976722b..3fa91eb 100644
--- a/buildinfo/version.go
+++ b/buildinfo/version.go
@@ -1,11 +1,3 @@
-// Copyright (c) Mainflux
-// SPDX-License-Identifier: Apache-2.0
-
-// Adapted for Orb project, modifications licensed under MPL v. 2.0:
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package buildinfo
 
 import (
diff --git a/cmd/main.go b/cmd/main.go
index d2e5c1c..38cd0a8 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 package main
 
 import (