diff --git a/lib/vfs/vfs_local/model_fsentry.v b/lib/vfs/vfs_local/model_fsentry.v
index 9b6deea9..2d37bcfc 100644
--- a/lib/vfs/vfs_local/model_fsentry.v
+++ b/lib/vfs/vfs_local/model_fsentry.v
@@ -1,6 +1,5 @@
 module vfs_local
 
-import os
 import freeflowuniverse.herolib.vfs
 
 // LocalFSEntry implements FSEntry for local filesystem
diff --git a/lib/vfs/vfs_mail/vfs_implementation_test.v b/lib/vfs/vfs_mail/vfs_implementation_test.v
index f8311348..bd80de18 100644
--- a/lib/vfs/vfs_mail/vfs_implementation_test.v
+++ b/lib/vfs/vfs_mail/vfs_implementation_test.v
@@ -1,15 +1,16 @@
 module vfs_mail
 
 import freeflowuniverse.herolib.vfs
-import freeflowuniverse.herolib.circles.models
-import freeflowuniverse.herolib.circles.models.mcc.mail
-import freeflowuniverse.herolib.circles.dbs.core
+// import freeflowuniverse.herolib.circles.mcc.models
+import freeflowuniverse.herolib.circles.mcc.models as mail
+import freeflowuniverse.herolib.circles.mcc.db as core
+import freeflowuniverse.herolib.circles.base
 import json
 import time
 
 fn test_mail_vfs() {
 	// Create a session state
-	mut session_state := models.new_session(name: 'test')!
+	mut session_state := base.new_session(name: 'test')!
 
 	// Create a mail database
 	mut mail_db := core.new_maildb(session_state)!