diff --git a/src/internal/app/plugins.go b/src/internal/app/plugins.go
index 17207a0..de11a81 100644
--- a/src/internal/app/plugins.go
+++ b/src/internal/app/plugins.go
@@ -16,7 +16,6 @@ type (
 )
 
 func CachePlugin(cArr map[string]string) Plugin {
-	// fmt.Println(cArr["cacheAddr"], cArr["cacheUsername"], cArr["cachePassword"])
 	return Plugin{
 		name: "cache",
 		fn: func() any { // FIXME: return type
@@ -45,24 +44,3 @@ func DatabasePlugin(cArr map[string]string) Plugin {
 		},
 	}
 }
-
-// func EventbusPlugin(cArr map[string]string) Plugin {
-// 	return Plugin{
-// 		name: "eventbus",
-// 		fn: func() any { // FIXME: return type
-// 			conn, err := amqp.Dial(cArr["eventBusURL"])
-// 			if err != nil {
-// 				log.Fatalf("Failed to connect to the EventBus: %s. Err: %v\n", cArr["eventBusURL"], err)
-// 				os.Exit(1) // TODO: retry in background...
-// 			}
-
-// 			chn, err := conn.Channel()
-// 			if err != nil {
-// 				log.Fatalf("Failed to open new EventBus channel. Err: %v\n", err)
-// 				os.Exit(1) // TODO: retry in background...
-// 			}
-
-// 			return chn
-// 		},
-// 	}
-// }
diff --git a/src/internal/server/config.go b/src/internal/server/config.go
index b6c03b6..b7cdf95 100644
--- a/src/internal/server/config.go
+++ b/src/internal/server/config.go
@@ -16,8 +16,6 @@ const (
 	defCacheUsername    = "default"
 	defCachePassword    = "12345678"
 	defDbURL            = "postgres://postgres:12345678@db-postgres:5432/egommerce"
-	defEventBusURL      = "amqp://guest:guest@api-eventbus:5672"
-	defKVNmspc          = "dev.egommerce/service/identity"
 	defNetAddr          = ":443"
 	defMongoDbURL       = "mongodb://mongodb:12345678@mongo-db:27017"
 	defPathPrefix       = "/identity"
@@ -57,8 +55,6 @@ func NewConfig(name string) *Config {
 	c.CacheUsername = cnf.GetEnv("API_CACHE_USERNAME", defCacheUsername)
 	c.CachePassword = cnf.GetEnv("API_CACHE_PASSWORD", defCachePassword)
 	c.DbURL = cnf.GetEnv("API_DATABASE_URL", defDbURL)
-	c.EventBusExchange = defEbEventsExchange
-	c.EventBusURL = cnf.GetEnv("API_EVENTBUS_URL", defEventBusURL)
 	c.PathPrefix = cnf.GetEnv("APP_PATH_PREFIX", defPathPrefix)
 
 	return c
@@ -71,9 +67,6 @@ func (c *Config) GetAppFullName() string {
 func (c *Config) GetIP() string {
 	host, _ := os.Hostname()
 	ips, _ := net.LookupIP(host)
-	// for _, ip := range ips {
-	// 	return ip.String()
-	// }
 
 	return ips[0].String()
 }
diff --git a/src/internal/service/jwt.go b/src/internal/service/jwt.go
index f2bb4c5..3b74db3 100644
--- a/src/internal/service/jwt.go
+++ b/src/internal/service/jwt.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	baseCnf "git.ego.freeddns.org/egommerce/go-api-pkg/config"
+	cnf "git.ego.freeddns.org/egommerce/go-api-pkg/config"
 	"github.com/golang-jwt/jwt"
 )
 
@@ -21,17 +21,17 @@ var (
 var jwtSrv *JWT
 
 func init() {
-	expAccessTokenTime, _ := strconv.Atoi(baseCnf.GetEnv("JWT_ACCESS_TOKEN_EXPIRE_TIME", "5"))
+	expAccessTokenTime, _ := strconv.Atoi(cnf.GetEnv("JWT_ACCESS_TOKEN_EXPIRE_TIME", "5"))
 	accessTokenExpireTime = time.Duration(int(time.Hour) * expAccessTokenTime) // hours
 
-	expRefreshTokenTime, _ := strconv.Atoi(baseCnf.GetEnv("JWT_REFRESH_TOKEN_EXPIRE_TIME", "7"))
+	expRefreshTokenTime, _ := strconv.Atoi(cnf.GetEnv("JWT_REFRESH_TOKEN_EXPIRE_TIME", "7"))
 	refreshTokenExpireTime = time.Duration(int(time.Hour*24) * expRefreshTokenTime) // days
 
 	jwtSrv = NewJWTService(
 		accessTokenExpireTime,
-		[]byte(baseCnf.GetEnv("JWT_ACCESS_TOKEN_SECRET_KEY", "FallbackAccessTokenSecret")),
+		[]byte(cnf.GetEnv("JWT_ACCESS_TOKEN_SECRET_KEY", "FallbackAccessTokenSecret")),
 		refreshTokenExpireTime,
-		[]byte(baseCnf.GetEnv("JWT_REFRESH_TOKEN_SECRET_KEY", "FallbackRefreshTokenSecret")),
+		[]byte(cnf.GetEnv("JWT_REFRESH_TOKEN_SECRET_KEY", "FallbackRefreshTokenSecret")),
 	)
 }