diff --git a/build-proto.sh b/build-proto.sh
deleted file mode 100755
index 122db4471..000000000
--- a/build-proto.sh
+++ /dev/null
@@ -1 +0,0 @@
-protoc --go_out=plugins=grpc:. -I. sam/chat/*.proto
diff --git a/cmd/crm/main.go b/cmd/crm/main.go
index d32f26eac..a377938c3 100644
--- a/cmd/crm/main.go
+++ b/cmd/crm/main.go
@@ -7,12 +7,11 @@ import (
 	service "github.com/crusttech/crust/crm"
 
 	"github.com/crusttech/crust/internal/auth"
-	"github.com/crusttech/crust/internal/mail"
 	"github.com/crusttech/crust/internal/rbac"
 )
 
 func main() {
-	flags("crm", service.Flags, auth.Flags, rbac.Flags, mail.Flags)
+	flags("crm", service.Flags, auth.Flags, rbac.Flags)
 
 	// log to stdout not stderr
 	log.SetOutput(os.Stdout)
diff --git a/cmd/messaging/main.go b/cmd/messaging/main.go
index 7b794ca4c..f0c876957 100644
--- a/cmd/messaging/main.go
+++ b/cmd/messaging/main.go
@@ -7,12 +7,11 @@ import (
 	service "github.com/crusttech/crust/messaging"
 
 	"github.com/crusttech/crust/internal/auth"
-	"github.com/crusttech/crust/internal/mail"
 	"github.com/crusttech/crust/internal/rbac"
 )
 
 func main() {
-	flags("messaging", service.Flags, auth.Flags, rbac.Flags, mail.Flags)
+	flags("messaging", service.Flags, auth.Flags, rbac.Flags)
 
 	// log to stdout not stderr
 	log.SetOutput(os.Stdout)
diff --git a/cmd/system/main.go b/cmd/system/main.go
index b5bbcdd65..6f4d430a6 100644
--- a/cmd/system/main.go
+++ b/cmd/system/main.go
@@ -7,12 +7,11 @@ import (
 	service "github.com/crusttech/crust/system"
 
 	"github.com/crusttech/crust/internal/auth"
-	"github.com/crusttech/crust/internal/mail"
 	"github.com/crusttech/crust/internal/rbac"
 )
 
 func main() {
-	flags("system", service.Flags, auth.Flags, rbac.Flags, mail.Flags)
+	flags("system", service.Flags, auth.Flags, rbac.Flags)
 
 	// log to stdout not stderr
 	log.SetOutput(os.Stdout)
diff --git a/internal/mail/flags.go b/internal/mail/flags.go
deleted file mode 100644
index 88e3b6581..000000000
--- a/internal/mail/flags.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package mail
-
-import (
-	"github.com/crusttech/crust/internal/config"
-)
-
-var flags *config.SMTP
-
-func Flags(prefix ...string) {
-	flags = new(config.SMTP).Init(prefix...)
-}
diff --git a/messaging/flags.go b/messaging/flags.go
index 6c857207f..99c6a5c31 100644
--- a/messaging/flags.go
+++ b/messaging/flags.go
@@ -21,7 +21,7 @@ var flags *appFlags
 
 func (c *appFlags) Validate() error {
 	if c == nil {
-		return errors.New("SAM flags are not initialized, need to call Flags()")
+		return errors.New("Flags are not initialized, need to call Flags()")
 	}
 	if err := c.http.Validate(); err != nil {
 		return err
@@ -46,7 +46,7 @@ func Flags(prefix ...string) {
 		return
 	}
 	if len(prefix) == 0 {
-		panic("sam.Flags() needs prefix on first call")
+		panic("Flags() needs prefix on first call")
 	}
 
 	flags = &appFlags{
diff --git a/messaging/repository/error.go b/messaging/repository/error.go
index e64314122..86aaf5099 100644
--- a/messaging/repository/error.go
+++ b/messaging/repository/error.go
@@ -20,7 +20,7 @@ func (e repositoryError) Error() string {
 }
 
 func (e repositoryError) String() string {
-	return "crust.sam.repository." + string(e)
+	return "crust.messaging.repository." + string(e)
 }
 
 func (e repositoryError) New() error {
diff --git a/messaging/repository/main_test.go b/messaging/repository/main_test.go
index ed417b9f7..aa7fed35e 100644
--- a/messaging/repository/main_test.go
+++ b/messaging/repository/main_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/namsral/flag"
 	"github.com/titpetric/factory"
 
-	samMigrate "github.com/crusttech/crust/messaging/db"
+	messagingMigrate "github.com/crusttech/crust/messaging/db"
 	systemMigrate "github.com/crusttech/crust/system/db"
 )
 
@@ -19,7 +19,7 @@ func TestMain(m *testing.M) {
 	// @todo this is a very optimistic initialization, make it more robust
 	godotenv.Load("../../.env")
 
-	prefix := "sam"
+	prefix := "messaging"
 	dsn := ""
 
 	p := func(s string) string {
@@ -43,7 +43,7 @@ func TestMain(m *testing.M) {
 		log.Printf("Error running migrations: %+v\n", err)
 		return
 	}
-	if err := samMigrate.Migrate(db); err != nil {
+	if err := messagingMigrate.Migrate(db); err != nil {
 		log.Printf("Error running migrations: %+v\n", err)
 		return
 	}
diff --git a/messaging/rest/handlers/attachment_custom.go b/messaging/rest/handlers/attachment_custom.go
index 0c967d344..1b43af780 100644
--- a/messaging/rest/handlers/attachment_custom.go
+++ b/messaging/rest/handlers/attachment_custom.go
@@ -27,7 +27,8 @@ func NewAttachmentDownloadable(ah AttachmentAPI) *Attachment {
 	serve := func(f interface{}, err error, w http.ResponseWriter, r *http.Request) {
 		if err != nil {
 			switch true {
-			case err.Error() == "crust.sam.repository.AttachmentNotFound":
+			// @todo: compare concrete exported error type? Go2 .As() like check?
+			case err.Error() == "crust.messaging.repository.AttachmentNotFound":
 				w.WriteHeader(http.StatusNotFound)
 			default:
 				http.Error(w, err.Error(), http.StatusInternalServerError)
diff --git a/messaging/routes.go b/messaging/routes.go
index 42b8286fa..3982ed728 100644
--- a/messaging/routes.go
+++ b/messaging/routes.go
@@ -42,7 +42,7 @@ func mountRoutes(r chi.Router, opts *config.HTTP, mounts ...func(r chi.Router))
 		r.Use(middleware.Logger)
 	}
 	if opts.Metrics {
-		r.Use(metrics.Middleware("sam"))
+		r.Use(metrics.Middleware("messaging"))
 	}
 
 	for _, mount := range mounts {
diff --git a/messaging/service/error.go b/messaging/service/error.go
index f2180634b..bae0374e6 100644
--- a/messaging/service/error.go
+++ b/messaging/service/error.go
@@ -5,5 +5,5 @@ type (
 )
 
 func (e serviceError) Error() string {
-	return "crust.sam.service." + string(e)
+	return "crust.messaging.service." + string(e)
 }
diff --git a/messaging/websocket/session.go b/messaging/websocket/session.go
index 32cbd18a7..f610a5fc4 100644
--- a/messaging/websocket/session.go
+++ b/messaging/websocket/session.go
@@ -13,7 +13,7 @@ import (
 	"github.com/crusttech/crust/internal/payload"
 	"github.com/crusttech/crust/internal/payload/outgoing"
 	"github.com/crusttech/crust/messaging/repository"
-	samService "github.com/crusttech/crust/messaging/service"
+	messagingService "github.com/crusttech/crust/messaging/service"
 	"github.com/crusttech/crust/messaging/types"
 	systemService "github.com/crusttech/crust/system/service"
 	systemTypes "github.com/crusttech/crust/system/types"
@@ -40,8 +40,8 @@ type (
 
 		svc struct {
 			user systemService.UserService
-			ch   samService.ChannelService
-			msg  samService.MessageService
+			ch   messagingService.ChannelService
+			msg  messagingService.MessageService
 		}
 	}
 )
@@ -57,8 +57,8 @@ func (Session) New(ctx context.Context, config *repository.Flags, conn *websocke
 	}
 
 	s.svc.user = systemService.DefaultUser
-	s.svc.ch = samService.DefaultChannel
-	s.svc.msg = samService.DefaultMessage
+	s.svc.ch = messagingService.DefaultChannel
+	s.svc.msg = messagingService.DefaultMessage
 
 	return s
 }
diff --git a/system/flags.go b/system/flags.go
index 474fc2721..2281232c0 100644
--- a/system/flags.go
+++ b/system/flags.go
@@ -21,7 +21,7 @@ var flags *appFlags
 
 func (c *appFlags) Validate() error {
 	if c == nil {
-		return errors.New("AUTH flags are not initialized, need to call Flags() or FullFlags()")
+		return errors.New("Flags are not initialized, need to call Flags() or FullFlags()")
 	}
 	if err := c.http.Validate(); err != nil {
 		return err
@@ -46,7 +46,7 @@ func Flags(prefix ...string) {
 		return
 	}
 	if len(prefix) == 0 {
-		panic("auth.Flags() needs prefix on first call")
+		panic("Flags() needs prefix on first call")
 	}
 	flags = &appFlags{
 		new(config.SMTP).Init(prefix...),