diff --git a/models/discovery/discovery.go b/models/discovery/discovery.go
deleted file mode 100644
index 57eaa82..0000000
--- a/models/discovery/discovery.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package discovery
-
-import (
-	"encoding/json"
-
-	"cloud.o-forge.io/core/oc-lib/models/utils"
-	"cloud.o-forge.io/core/oc-lib/tools"
-	"github.com/google/uuid"
-)
-
-type Discovery struct {
-	utils.AbstractObject
-	Host  string `json:"host,omitempty" bson:"host,omitempty"`
-	Port  string `json:"port,omitempty" bson:"port,omitempty"`
-	State int    `json:"state,omitempty" bson:"state,omitempty"`
-}
-
-func (ao *Discovery) GetID() string {
-	return ao.UUID
-}
-
-func (r *Discovery) GenerateID() {
-	if r.UUID == "" {
-		r.UUID = uuid.New().String()
-	}
-}
-
-func (d *Discovery) GetName() string {
-	return d.Name
-}
-
-func (d *Discovery) GetAccessor(caller *tools.HTTPCaller) utils.Accessor {
-	data := New()
-	data.Init(utils.DISCOVERY, caller)
-	return data
-}
-
-func (dma *Discovery) Deserialize(j map[string]interface{}) utils.DBObject {
-	d := &Discovery{}
-	b, err := json.Marshal(j)
-	if err != nil {
-		return nil
-	}
-	json.Unmarshal(b, d)
-	return d
-}
-
-func (dma *Discovery) Serialize() map[string]interface{} {
-	var m map[string]interface{}
-	b, err := json.Marshal(dma)
-	if err != nil {
-		return nil
-	}
-	json.Unmarshal(b, &m)
-	return m
-}
diff --git a/models/discovery/discovery_mongo_accessor.go b/models/discovery/discovery_mongo_accessor.go
deleted file mode 100644
index 10c04e2..0000000
--- a/models/discovery/discovery_mongo_accessor.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package discovery
-
-import (
-	"cloud.o-forge.io/core/oc-lib/dbs"
-	"cloud.o-forge.io/core/oc-lib/dbs/mongo"
-	"cloud.o-forge.io/core/oc-lib/models/utils"
-)
-
-type discoveryMongoAccessor struct {
-	utils.AbstractAccessor
-}
-
-func New() *discoveryMongoAccessor {
-	return &discoveryMongoAccessor{}
-}
-
-func (wfa *discoveryMongoAccessor) DeleteOne(id string) (utils.DBObject, int, error) {
-	return wfa.GenericDeleteOne(id, wfa)
-}
-
-func (wfa *discoveryMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
-	return wfa.GenericUpdateOne(set, id, wfa, &Discovery{})
-}
-
-func (wfa *discoveryMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
-	return wfa.GenericStoreOne(data, wfa)
-}
-
-func (wfa *discoveryMongoAccessor) CopyOne(data utils.DBObject) (utils.DBObject, int, error) {
-	return wfa.GenericStoreOne(data, wfa)
-}
-
-func (wfa *discoveryMongoAccessor) LoadOne(id string) (utils.DBObject, int, error) {
-	var workflow Discovery
-	res_mongo, code, err := mongo.MONGOService.LoadOne(id, wfa.GetType())
-	if err != nil {
-		wfa.Logger.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())
-		return nil, code, err
-	}
-	res_mongo.Decode(&workflow)
-	return &workflow, 200, nil
-}
-
-func (wfa discoveryMongoAccessor) LoadAll() ([]utils.ShallowDBObject, int, error) {
-	objs := []utils.ShallowDBObject{}
-	res_mongo, code, err := mongo.MONGOService.LoadAll(wfa.GetType())
-	if err != nil {
-		wfa.Logger.Error().Msg("Could not retrieve any from db. Error: " + err.Error())
-		return nil, code, err
-	}
-	var results []Discovery
-	if err = res_mongo.All(mongo.MngoCtx, &results); err != nil {
-		return nil, 404, err
-	}
-	for _, r := range results {
-		objs = append(objs, &r.AbstractObject)
-	}
-	return objs, 200, nil
-}
-
-func (wfa *discoveryMongoAccessor) Search(filters *dbs.Filters, search string) ([]utils.ShallowDBObject, int, error) {
-	objs := []utils.ShallowDBObject{}
-	if (filters == nil || len(filters.And) == 0 || len(filters.Or) == 0) && search != "" {
-		filters = &dbs.Filters{
-			Or: map[string][]dbs.Filter{
-				"abstractobject.name": {{Operator: dbs.LIKE.String(), Value: search}},
-			},
-		}
-	}
-	res_mongo, code, err := mongo.MONGOService.Search(filters, wfa.GetType())
-	if err != nil {
-		wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error())
-		return nil, code, err
-	}
-	var results []Discovery
-	if err = res_mongo.All(mongo.MngoCtx, &results); err != nil {
-		return nil, 404, err
-	}
-	for _, r := range results {
-		objs = append(objs, &r)
-	}
-	return objs, 200, nil
-}