diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index 3e94714e..1ce96eda 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -31,6 +31,7 @@ async fn main() -> std::io::Result<()> {
     let url = args
         .url
         .or_else(|| std::env::var("URL").ok())
+        .map(|url| url.trim_end_matches('/').to_string())
         .unwrap_or_else(|| {
             eprintln!("No URL specified. Use --url or set the URL environment variable.");
             std::process::exit(1);
@@ -63,10 +64,10 @@ async fn main() -> std::io::Result<()> {
             command.exec(client).await;
         }
         Commands::Server(command) => command.exec(client).await,
-        Commands::Account(command) => command.exec(client).await,
+        /*Commands::Account(command) => command.exec(client).await,
         Commands::Domain(command) => command.exec(client).await,
         Commands::List(command) => command.exec(client).await,
-        Commands::Group(command) => command.exec(client).await,
+        Commands::Group(command) => command.exec(client).await,*/
         Commands::Queue(command) => command.exec(client).await,
         Commands::Report(command) => command.exec(client).await,
     }
diff --git a/crates/cli/src/modules/cli.rs b/crates/cli/src/modules/cli.rs
index f30ee8a8..0938decd 100644
--- a/crates/cli/src/modules/cli.rs
+++ b/crates/cli/src/modules/cli.rs
@@ -29,21 +29,21 @@ pub struct Cli {
 #[derive(Subcommand)]
 pub enum Commands {
     /// Manage user accounts
-    #[clap(subcommand)]
-    Account(AccountCommands),
+    /* #[clap(subcommand)]
+        Account(AccountCommands),
 
-    /// Manage domains
-    #[clap(subcommand)]
-    Domain(DomainCommands),
+        /// Manage domains
+        #[clap(subcommand)]
+        Domain(DomainCommands),
 
-    /// Manage mailing lists
-    #[clap(subcommand)]
-    List(ListCommands),
-
-    /// Manage groups
-    #[clap(subcommand)]
-    Group(GroupCommands),
+        /// Manage mailing lists
+        #[clap(subcommand)]
+        List(ListCommands),
 
+        /// Manage groups
+        #[clap(subcommand)]
+        Group(GroupCommands),
+    */
     /// Import JMAP accounts and Maildir/mbox mailboxes
     #[clap(subcommand)]
     Import(ImportCommands),