diff --git a/CommonCore/SQL/src/de/steamwar/sql/Team.kt b/CommonCore/SQL/src/de/steamwar/sql/Team.kt
index 8000fbb0..66614ad2 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Team.kt
+++ b/CommonCore/SQL/src/de/steamwar/sql/Team.kt
@@ -32,8 +32,6 @@ object TeamTable : IntIdTable("Team", "TeamID") {
     val color = char("TeamColor", 1).default("8")
     val name = varchar("TeamName", 16)
     val deleted = bool("TeamDeleted").default(false)
-    val address = text("Address").nullable()
-    val port = ushort("Port").default(25565u)
 }
 
 class Team(id: EntityID<Int>) : IntEntity(id) {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java b/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java
index d5756890..c07e0a29 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java
@@ -76,13 +76,11 @@ public class GDPRQuery extends SWCommand {
         sqlCSV(user, out, bauweltMember, "BuildMember.csv");
         sqlCSV(user, out, bauweltMembers, "BuildMembers.csv");
         sqlCSV(user, out, checkedSchems, "SchematicChecksessions.csv");
-        sqlCSV(user, out, userElo, "UserElo.csv");
         sqlCSV(user, out, fights, "Fights.csv");
         sqlCSV(user, out, ignoredPlayers, "IgnoredPlayers.csv");
         sqlCSV(user, out, ignoringPlayers, "IgnoringPlayers.csv");
         sqlCSV(user, out, schematicMember, "SchematicMember.csv");
         sqlCSV(user, out, schematicMembers, "SchematicMembers.csv");
-        sqlCSV(user, out, pollAnswers, "PollAnswers.csv");
         sqlCSV(user, out, punishments, "Punishments.csv");
         sqlCSV(user, out, sessions, "Sessions.csv");
         sqlCSV(user, out, userData, "UserData.csv");
@@ -104,13 +102,11 @@ public class GDPRQuery extends SWCommand {
     private static final Statement bauweltMember = new Statement("SELECT BauweltID AS Bauwelt, WorldEdit, World FROM BauweltMember WHERE MemberID = ?");
     private static final Statement bauweltMembers = new Statement("SELECT u.UserName AS 'User', m.WorldEdit AS WorldEdit, m.World AS World FROM BauweltMember m INNER JOIN UserData u ON m.MemberID = u.id WHERE m.BauweltID = ?");
     private static final Statement checkedSchems = new Statement("SELECT NodeName AS Schematic, StartTime, EndTime, DeclineReason AS Result FROM CheckedSchematic WHERE NodeOwner = ? ORDER BY StartTime ASC");
-    private static final Statement userElo = new Statement("SELECT GameMode, Elo, Season FROM Elo WHERE UserID = ?");
     private static final Statement fights = new Statement("SELECT p.Team AS Team, p.Kit AS Kit, p.Kills AS Kills, p.IsOut AS Died, f.GameMode AS GameMode, f.Server AS Server, f.StartTime AS StartTime, f.Duration AS Duration, (f.BlueLeader = p.UserID) AS IsBlueLeader, (f.RedLeader = p.UserID) AS IsRedLeader, f.Win AS Winner, f.WinCondition AS WinCondition FROM Fight f INNER JOIN FightPlayer p ON f.FightID = p.FightID WHERE p.UserID = ? ORDER BY StartTime ASC");
     private static final Statement ignoredPlayers = new Statement("SELECT u.UserName AS IgnoredPlayer FROM IgnoredPlayers i INNER JOIN UserData u ON i.Ignored = u.id WHERE Ignorer = ?");
     private static final Statement ignoringPlayers = new Statement("SELECT Ignorer AS IgnoringPlayers FROM IgnoredPlayers WHERE Ignored = ?");
     private static final Statement schematicMember = new Statement("SELECT s.NodeName AS SchematicName, u.UserName AS SchematicOwner FROM NodeMember m INNER JOIN SchematicNode s ON m.NodeId = s.NodeId INNER JOIN UserData u ON s.NodeOwner = u.id WHERE m.UserId = ?");
     private static final Statement schematicMembers = new Statement("SELECT s.NodeName AS SchematicName, u.UserName AS Member FROM NodeMember m INNER JOIN SchematicNode s ON m.NodeId = s.NodeId INNER JOIN UserData u ON m.UserId = u.id WHERE s.NodeOwner = ?");
-    private static final Statement pollAnswers = new Statement("SELECT Question, Answer FROM PollAnswer WHERE UserID = ?");
     private static final Statement punishments = new Statement("SELECT Type, StartTime, EndTime, Perma, Reason FROM Punishments WHERE UserId = ?");
     private static final Statement sessions = new Statement("SELECT StartTime, EndTime FROM Session WHERE UserID = ?");
     private static final Statement userData = new Statement("SELECT * FROM UserData WHERE id = ?");