diff --git a/src/main/java/com/commafeed/backend/dao/FeedDAO.java b/src/main/java/com/commafeed/backend/dao/FeedDAO.java
index 4514f8e2..e6b55150 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedDAO.java
@@ -15,7 +15,6 @@ import javax.persistence.criteria.Root;
 import javax.persistence.criteria.SetJoin;
 import javax.persistence.criteria.Subquery;
 import javax.persistence.metamodel.SingularAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringUtils;
@@ -114,7 +113,6 @@ public class FeedDAO extends GenericDAO<Feed> {
 
 	}
 
-	@XmlRootElement
 	public static enum DuplicateMode {
 		NORMALIZED_URL(Feed_.normalizedUrlHash), LAST_CONTENT(Feed_.lastContentHash), PUSH_TOPIC(Feed_.pushTopicHash);
 		private SingularAttribute<Feed, String> path;
diff --git a/src/main/java/com/commafeed/backend/model/ApplicationSettings.java b/src/main/java/com/commafeed/backend/model/ApplicationSettings.java
index fc99374d..7d015166 100644
--- a/src/main/java/com/commafeed/backend/model/ApplicationSettings.java
+++ b/src/main/java/com/commafeed/backend/model/ApplicationSettings.java
@@ -3,9 +3,6 @@ package com.commafeed.backend.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -15,8 +12,6 @@ import org.apache.log4j.Level;
 @Entity
 @Table(name = "APPLICATIONSETTINGS")
 @SuppressWarnings("serial")
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 @Getter
 @Setter
 public class ApplicationSettings extends AbstractModel {
diff --git a/src/main/java/com/commafeed/backend/model/UserSettings.java b/src/main/java/com/commafeed/backend/model/UserSettings.java
index 13e9bfe9..888657e6 100644
--- a/src/main/java/com/commafeed/backend/model/UserSettings.java
+++ b/src/main/java/com/commafeed/backend/model/UserSettings.java
@@ -10,7 +10,6 @@ import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -27,17 +26,14 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
 @Setter
 public class UserSettings extends AbstractModel {
 
-	@XmlRootElement
 	public enum ReadingMode {
 		all, unread
 	}
 
-	@XmlRootElement
 	public enum ReadingOrder {
 		asc, desc
 	}
 
-	@XmlRootElement
 	public enum ViewMode {
 		title, expanded
 	}
diff --git a/src/main/java/com/commafeed/frontend/model/Category.java b/src/main/java/com/commafeed/frontend/model/Category.java
index ed4f2a49..2d1b47cb 100644
--- a/src/main/java/com/commafeed/frontend/model/Category.java
+++ b/src/main/java/com/commafeed/frontend/model/Category.java
@@ -3,10 +3,6 @@ package com.commafeed.frontend.model;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import lombok.Data;
 
 import com.google.common.collect.Lists;
@@ -14,8 +10,6 @@ import com.wordnik.swagger.annotations.ApiClass;
 import com.wordnik.swagger.annotations.ApiProperty;
 
 @SuppressWarnings("serial")
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 @ApiClass("Entry details")
 @Data
 public class Category implements Serializable {
diff --git a/src/main/java/com/commafeed/frontend/model/Entries.java b/src/main/java/com/commafeed/frontend/model/Entries.java
index c174d2e9..c4e6fc3d 100644
--- a/src/main/java/com/commafeed/frontend/model/Entries.java
+++ b/src/main/java/com/commafeed/frontend/model/Entries.java
@@ -3,10 +3,6 @@ package com.commafeed.frontend.model;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import lombok.Data;
 
 import com.google.common.collect.Lists;
@@ -14,8 +10,6 @@ import com.wordnik.swagger.annotations.ApiClass;
 import com.wordnik.swagger.annotations.ApiProperty;
 
 @SuppressWarnings("serial")
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 @ApiClass("List of entries with some metadata")
 @Data
 public class Entries implements Serializable {
diff --git a/src/main/java/com/commafeed/frontend/model/Entry.java b/src/main/java/com/commafeed/frontend/model/Entry.java
index 1cf252dc..72063eb3 100644
--- a/src/main/java/com/commafeed/frontend/model/Entry.java
+++ b/src/main/java/com/commafeed/frontend/model/Entry.java
@@ -4,10 +4,6 @@ import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Date;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import lombok.Data;
 
 import com.commafeed.backend.feeds.FeedUtils;
@@ -22,8 +18,6 @@ import com.wordnik.swagger.annotations.ApiClass;
 import com.wordnik.swagger.annotations.ApiProperty;
 
 @SuppressWarnings("serial")
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 @ApiClass("Entry details")
 @Data
 public class Entry implements Serializable {
diff --git a/src/main/java/com/commafeed/frontend/model/FeedCount.java b/src/main/java/com/commafeed/frontend/model/FeedCount.java
index 19d53ddf..0039ccff 100644
--- a/src/main/java/com/commafeed/frontend/model/FeedCount.java
+++ b/src/main/java/com/commafeed/frontend/model/FeedCount.java
@@ -3,17 +3,13 @@ package com.commafeed.frontend.model;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import lombok.Data;
 
 import com.commafeed.backend.model.Feed;
 import com.google.common.collect.Lists;
+import com.wordnik.swagger.annotations.ApiClass;
 
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
+@ApiClass("Feed count")
 @Data
 public class FeedCount implements Serializable {
 
diff --git a/src/main/java/com/commafeed/frontend/model/FeedInfo.java b/src/main/java/com/commafeed/frontend/model/FeedInfo.java
index ed355cb1..0074e72a 100644
--- a/src/main/java/com/commafeed/frontend/model/FeedInfo.java
+++ b/src/main/java/com/commafeed/frontend/model/FeedInfo.java
@@ -2,17 +2,11 @@ package com.commafeed.frontend.model;
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import lombok.Data;
 
 import com.wordnik.swagger.annotations.ApiClass;
 
 @SuppressWarnings("serial")
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 @ApiClass("Feed details")
 @Data
 public class FeedInfo implements Serializable {
diff --git a/src/main/java/com/commafeed/frontend/model/ServerInfo.java b/src/main/java/com/commafeed/frontend/model/ServerInfo.java
index d08110c7..89724eee 100644
--- a/src/main/java/com/commafeed/frontend/model/ServerInfo.java
+++ b/src/main/java/com/commafeed/frontend/model/ServerInfo.java
@@ -3,18 +3,12 @@ package com.commafeed.frontend.model;
 import java.io.Serializable;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import lombok.Data;
 
 import com.google.common.collect.Maps;
 import com.wordnik.swagger.annotations.ApiClass;
 
 @SuppressWarnings("serial")
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 @ApiClass("Server infos")
 @Data
 public class ServerInfo implements Serializable {
diff --git a/src/main/java/com/commafeed/frontend/model/Settings.java b/src/main/java/com/commafeed/frontend/model/Settings.java
index 43a620e9..6decfe6e 100644
--- a/src/main/java/com/commafeed/frontend/model/Settings.java
+++ b/src/main/java/com/commafeed/frontend/model/Settings.java
@@ -2,18 +2,12 @@ package com.commafeed.frontend.model;
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import lombok.Data;
 
 import com.wordnik.swagger.annotations.ApiClass;
 import com.wordnik.swagger.annotations.ApiProperty;
 
 @SuppressWarnings("serial")
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 @ApiClass("User settings")
 @Data
 public class Settings implements Serializable {
diff --git a/src/main/java/com/commafeed/frontend/model/Subscription.java b/src/main/java/com/commafeed/frontend/model/Subscription.java
index 8810ec38..605eeb99 100644
--- a/src/main/java/com/commafeed/frontend/model/Subscription.java
+++ b/src/main/java/com/commafeed/frontend/model/Subscription.java
@@ -3,10 +3,6 @@ package com.commafeed.frontend.model;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import lombok.Data;
 
 import com.commafeed.backend.feeds.FeedUtils;
@@ -17,8 +13,6 @@ import com.wordnik.swagger.annotations.ApiClass;
 import com.wordnik.swagger.annotations.ApiProperty;
 
 @SuppressWarnings("serial")
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 @ApiClass("User information")
 @Data
 public class Subscription implements Serializable {
diff --git a/src/main/java/com/commafeed/frontend/model/UnreadCount.java b/src/main/java/com/commafeed/frontend/model/UnreadCount.java
index c0871539..83b05274 100644
--- a/src/main/java/com/commafeed/frontend/model/UnreadCount.java
+++ b/src/main/java/com/commafeed/frontend/model/UnreadCount.java
@@ -3,17 +3,11 @@ package com.commafeed.frontend.model;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import lombok.Data;
 
 import com.wordnik.swagger.annotations.ApiClass;
 
 @SuppressWarnings("serial")
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 @ApiClass("Unread count")
 @Data
 public class UnreadCount implements Serializable {
diff --git a/src/main/java/com/commafeed/frontend/model/UserModel.java b/src/main/java/com/commafeed/frontend/model/UserModel.java
index 38ed2819..55843d16 100644
--- a/src/main/java/com/commafeed/frontend/model/UserModel.java
+++ b/src/main/java/com/commafeed/frontend/model/UserModel.java
@@ -3,18 +3,12 @@ package com.commafeed.frontend.model;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import lombok.Data;
 
 import com.wordnik.swagger.annotations.ApiClass;
 import com.wordnik.swagger.annotations.ApiProperty;
 
 @SuppressWarnings("serial")
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 @ApiClass("User information")
 @Data
 public class UserModel implements Serializable {