diff --git a/Geekbot.net/Database/DatabaseContext.cs b/Geekbot.net/Database/DatabaseContext.cs
index 56c19f8..505486f 100644
--- a/Geekbot.net/Database/DatabaseContext.cs
+++ b/Geekbot.net/Database/DatabaseContext.cs
@@ -7,7 +7,6 @@ namespace Geekbot.net.Database
     {
         public DbSet<QuoteModel> Quotes { get; set; }
         public DbSet<UserModel> Users { get; set; }
-        public DbSet<GuildsModel> Guilds { get; set; }
         public DbSet<GuildSettingsModel> GuildSettings { get; set; }
         public DbSet<KarmaModel> Karma { get; set; }
         public DbSet<ShipsModel> Ships { get; set; }
@@ -16,7 +15,6 @@ namespace Geekbot.net.Database
         public DbSet<SlapsModel> Slaps { get; set; }
         public DbSet<GlobalsModel> Globals { get; set; }
         public DbSet<RoleSelfServiceModel> RoleSelfService { get; set; }
-        public DbSet<PollModel> Polls { get; set; }
         public DbSet<CookiesModel> Cookies { get; set; }
         public DbSet<ReactionListenerModel> ReactionListeners { get; set; }
     }
diff --git a/Geekbot.net/Database/Models/GuildsModel.cs b/Geekbot.net/Database/Models/GuildsModel.cs
deleted file mode 100644
index b6347a6..0000000
--- a/Geekbot.net/Database/Models/GuildsModel.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace Geekbot.net.Database.Models
-{
-    public class GuildsModel
-    {
-        [Key]
-        public int Id { get; set; }
-        
-        [Required]
-        public long GuildId { get; set; }
-        
-        [Required]
-        public string Name { get; set; }
-        
-        [Required]
-        public long Owner { get; set; }
-        
-        public string IconUrl { get; set; }
-        
-        public DateTimeOffset CreatedAt { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Geekbot.net/Database/Models/PollModel.cs b/Geekbot.net/Database/Models/PollModel.cs
deleted file mode 100644
index 3b12410..0000000
--- a/Geekbot.net/Database/Models/PollModel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace Geekbot.net.Database.Models
-{
-    public class PollModel
-    {
-        [Key]
-        public int Id { get; set; }
-        
-        [Required]
-        public long GuildId { get; set; }
-        
-        [Required]
-        public long ChannelId { get; set; }
-        
-        public string Question { get; set; }
-        
-        public long Creator { get; set; }
-        
-        public long MessageId { get; set; }
-
-        public List<PollQuestionModel> Options { get; set; }
-
-        public bool IsFinshed { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Geekbot.net/Database/Models/PollQuestionModel.cs b/Geekbot.net/Database/Models/PollQuestionModel.cs
deleted file mode 100644
index e251fe2..0000000
--- a/Geekbot.net/Database/Models/PollQuestionModel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Geekbot.net.Database.Models
-{
-    public class PollQuestionModel
-    {
-        [Key]
-        public int Id { get; set; }
-        
-        public int OptionId { get; set; }
-        
-        public string OptionText { get; set; }
-        
-        public int Votes { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Geekbot.net/Lib/RunParameters.cs b/Geekbot.net/Lib/RunParameters.cs
index e17825f..e1386d3 100644
--- a/Geekbot.net/Lib/RunParameters.cs
+++ b/Geekbot.net/Lib/RunParameters.cs
@@ -59,14 +59,5 @@ namespace Geekbot.net.Lib
         
         [Option("api-port", Default = "12995", HelpText = "Port on which the WebApi listens")]
         public string ApiPort { get; set; }
-        
-        /************************************
-         * Prometheus                       *
-         ************************************/
-        [Option("prometheus-host", Default = "localhost", HelpText = "Host on which the Prometheus Metric Server listens")]
-        public string PrometheusHost { get; set; }
-        
-        [Option("prometheus-port", Default = "12991", HelpText = "Port on which the Prometheus Metric Server listens")]
-        public string PrometheusPort { get; set; }
     }
 }
\ No newline at end of file