server-core -> juick-server

45 files changed, 0 insertions, 5439 deletions

diff --git a/server-core/src/main/java/com/juick/configuration/DataConfiguration.java b/server-core/src/main/java/com/juick/configuration/DataConfiguration.java
deleted file mode 100644
index 88fc00b3..00000000
--- a/server-core/src/main/java/com/juick/configuration/DataConfiguration.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.juick.configuration;
-
-import org.apache.commons.dbcp2.BasicDataSource;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.transaction.annotation.TransactionManagementConfigurer;
-
-import javax.annotation.Resource;
-import javax.sql.DataSource;
-
-/**
- * Created by aalexeev on 11/11/16.
- */
-@Configuration
-@EnableTransactionManagement
-@PropertySource(value = {"classpath:juick.conf"})
-@ComponentScan(basePackages = {"com.juick.service"})
-public class DataConfiguration implements TransactionManagementConfigurer {
-    @Resource
-    private Environment env;
-
-    @Bean
-    public DataSource dataSource() {
-        BasicDataSource dataSource = new BasicDataSource();
-
-        dataSource.setDriverClassName(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
-        dataSource.setUrl(env.getProperty("datasource_url"));
-        dataSource.setUsername(env.getProperty("datasource_user", ""));
-        dataSource.setPassword(env.getProperty("datasource_password", ""));
-
-        dataSource.setValidationQuery("select 1");
-
-        return dataSource;
-    }
-
-    @Bean
-    public PlatformTransactionManager transactionManager() {
-        return new DataSourceTransactionManager(dataSource());
-    }
-
-    @Override
-    public PlatformTransactionManager annotationDrivenTransactionManager() {
-        return transactionManager();
-    }
-
-    @Bean
-    public JdbcTemplate jdbcTemplate() {
-        return new JdbcTemplate(dataSource());
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/AdsQueries.java b/server-core/src/main/java/com/juick/server/AdsQueries.java
deleted file mode 100644
index 06590817..00000000
--- a/server-core/src/main/java/com/juick/server/AdsQueries.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, ugnich
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-/**
- *
- * @author ugnich
- */
-public class AdsQueries {
-
-    public static int getAdMID(JdbcTemplate sql, int uid) {
-        if (uid > 0) {
-            try {
-                return sql.queryForObject("SELECT message_id FROM ads_messages " +
-                                "WHERE message_id NOT IN (SELECT message_id FROM ads_messages_log WHERE user_id=? " +
-                                "AND ts>UNIX_TIMESTAMP()-60*60*24 GROUP BY message_id HAVING COUNT(*)>2) ORDER BY RAND() LIMIT 1",
-                        Integer.class, uid);
-            } catch (EmptyResultDataAccessException e) {
-                return 0;
-            }
-        } else {
-            try {
-                return sql.queryForObject("SELECT message_id FROM ads_messages ORDER BY RAND() LIMIT 1", Integer.class);
-            } catch (EmptyResultDataAccessException e) {
-                return 0;
-            }
-        }
-    }
-
-    public static void logAdMID(JdbcTemplate sql, int uid, int mid) {
-        sql.update("INSERT INTO ads_messages_log(user_id,message_id,ts) VALUES (?,?,UNIX_TIMESTAMP())", uid, mid);
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/CrosspostQueries.java b/server-core/src/main/java/com/juick/server/CrosspostQueries.java
deleted file mode 100644
index 827dad09..00000000
--- a/server-core/src/main/java/com/juick/server/CrosspostQueries.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2013, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import com.juick.server.helpers.ApplicationStatus;
-import org.apache.commons.lang3.tuple.Pair;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import java.util.Optional;
-
-/**
- *
- * @author ugnich
- */
-public class CrosspostQueries {
-
-    public static Optional<Pair<String, String>> getTwitterTokens(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT access_token,access_token_secret FROM twitter WHERE user_id=? AND crosspost=1",
-                    (rs, num) -> Optional.of(Pair.of(rs.getString(1), rs.getString(2))), uid);
-        } catch (EmptyResultDataAccessException e) {
-            return Optional.empty();
-        }
-    }
-
-    public static Optional<String> getFacebookToken(JdbcTemplate sql, int uid) {
-        try {
-            return Optional.of(sql.queryForObject("SELECT access_token FROM facebook WHERE user_id=? AND access_token IS NOT NULL " +
-                    "AND crosspost=1", String.class, uid));
-        } catch (EmptyResultDataAccessException e) {
-            return Optional.empty();
-        }
-    }
-    public static ApplicationStatus isFBCrossPostEnabled(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT 1, crosspost FROM facebook WHERE user_id=? LIMIT 1", (rs, num) -> {
-                ApplicationStatus status = new ApplicationStatus();
-                status.setConnected(rs.getInt(1) > 0);
-                status.setCrosspostEnabled(rs.getBoolean(2));
-                return status;
-            }, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return new ApplicationStatus();
-        }
-    }
-
-    public static String getTwitterName(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT uname FROM twitter WHERE user_id=?", String.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return "";
-        }
-    }
-
-    public static String getTelegramName(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT tg_name FROM telegram WHERE user_id=?", String.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return "";
-        }
-    }
-
-    public static Optional<Pair<String, String>> getVKTokens(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT vk_id,access_token FROM vk WHERE user_id=? AND crosspost=1",
-                    (rs, num) -> Optional.of(Pair.of(rs.getString(1), rs.getString(2))), uid);
-        } catch (EmptyResultDataAccessException e) {
-            return Optional.empty();
-        }
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/MessagesQueries.java b/server-core/src/main/java/com/juick/server/MessagesQueries.java
deleted file mode 100644
index 9d4284bc..00000000
--- a/server-core/src/main/java/com/juick/server/MessagesQueries.java
+++ /dev/null
@@ -1,657 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import com.juick.Message;
-import com.juick.Tag;
-import com.juick.User;
-import com.juick.server.helpers.PrivacyOpts;
-import com.juick.util.MessageUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.util.StringUtils;
-
-import java.sql.*;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class MessagesQueries {
-
-    public static class MessageMapper implements RowMapper<Message> {
-        @Override
-        public Message mapRow(ResultSet rs, int rowNum) throws SQLException {
-            Message msg = new Message();
-            msg.setMid(rs.getInt(1));
-            msg.setRid(rs.getInt(2));
-            msg.setReplyto(rs.getInt(3));
-            User user = new User();
-            user.setUid(rs.getInt(4));
-            user.setName(rs.getString(5));
-            user.setBanned(rs.getBoolean(6));
-            msg.setUser(user);
-            msg.TimeAgo = rs.getInt(7);
-            msg.setDate(rs.getTimestamp(8));
-            msg.ReadOnly = rs.getBoolean(9);
-            msg.setPrivacy(rs.getInt(10));
-            msg.FriendsOnly = msg.getPrivacy() < 0;
-            msg.Replies = rs.getInt(11);
-            msg.AttachmentType = rs.getString(12);
-            if (rs.getDouble(13) != 0) {
-                msg.Place = new com.juick.Place();
-                msg.Place.lat = rs.getDouble(14);
-                msg.Place.lon = rs.getDouble(15);
-            }
-            msg.Likes = rs.getInt(16);
-            msg.Hidden = rs.getBoolean(17);
-            // parse tags string
-            String tagsStr = rs.getString(18);
-            if (tagsStr != null) {
-                Arrays.stream(tagsStr.split(" ")).forEach(t -> msg.getTags().add(new Tag(t)));
-            }
-            msg.RepliesBy = rs.getString(19);
-            msg.setText(rs.getString(20));
-            msg.setReplyQuote(MessageUtils.formatQuote(rs.getString(21)));
-            return msg;
-        }
-    }
-
-    public static int createMessage(JdbcTemplate sql, int uid, String txt, String attachment, List<com.juick.Tag> tags) {
-        KeyHolder holder = new GeneratedKeyHolder();
-        sql.update(con -> {
-            PreparedStatement stmt = con.prepareStatement("INSERT INTO messages(user_id,attach) VALUES (?,?)",
-                    Statement.RETURN_GENERATED_KEYS);
-            stmt.setInt(1, uid);
-            if (attachment != null) {
-                stmt.setString(2, attachment);
-            } else {
-                stmt.setNull(2, Types.VARCHAR);
-            }
-            return stmt;
-        }, holder);
-
-        int mid = holder.getKey().intValue();
-
-
-        if (mid > 0) {
-
-            String tagsNames = "";
-            String tagsIDs = "";
-
-            for (int i = 0; i < tags.size(); i++) {
-                if (i > 0) {
-                    tagsNames += " ";
-                    tagsIDs += ",";
-                }
-                tagsNames += tags.get(i).getName();
-                tagsIDs += "(" + mid + "," + tags.get(i).TID + ")";
-            }
-            if (tags.size() > 0) {
-                sql.execute("INSERT INTO messages_tags(message_id,tag_id) VALUES " + tagsIDs);
-            }
-            final String finalTagsNames = tagsNames;
-            sql.update(con -> {
-                PreparedStatement stmt = con.prepareStatement("INSERT INTO messages_txt(message_id,tags,txt) " +
-                        "VALUES (?,?,?)", Statement.NO_GENERATED_KEYS);
-                stmt.setInt(1, mid);
-                if (finalTagsNames.isEmpty()) {
-                    stmt.setNull(2, Types.VARCHAR);
-                } else {
-                    stmt.setString(2, finalTagsNames);
-                }
-                stmt.setString(3, txt);
-                return stmt;
-            });
-        }
-
-        return mid;
-    }
-
-    public static int createReply(JdbcTemplate sql, int mid, int rid, int uid, String txt, String attachment) {
-        int ridnew = getReplyIDIncrement(sql, mid);
-
-        sql.update( con -> {
-            PreparedStatement stmt = con.prepareStatement("INSERT INTO replies(message_id,reply_id,user_id," +
-                    "replyto,attach,txt) VALUES (?,?,?,?,?,?)", Statement.NO_GENERATED_KEYS);
-            stmt.setInt(1, mid);
-            stmt.setInt(2, ridnew);
-            stmt.setInt(3, uid);
-            stmt.setInt(4, rid);
-            if (attachment != null) {
-                stmt.setString(5, attachment);
-            } else {
-                stmt.setNull(5, Types.VARCHAR);
-            }
-            stmt.setString(6, txt);
-            return stmt;
-        });
-
-        if (ridnew > 0) {
-            sql.update("UPDATE messages SET replies=replies+1 WHERE message_id=?", mid);
-        }
-
-        return ridnew;
-    }
-
-    public static int getReplyIDIncrement(JdbcTemplate sql, int mid) {
-        return sql.execute((ConnectionCallback<Integer>) conn -> {
-            conn.setAutoCommit(false);
-            final int replyNo;
-            try (PreparedStatement ps = conn.prepareStatement("START TRANSACTION")) {
-                ps.executeUpdate();
-            }
-            try (PreparedStatement ps = conn.prepareStatement("SELECT maxreplyid+1 FROM messages WHERE message_id=? FOR UPDATE")) {
-                ps.setInt(1, mid);
-                try (ResultSet resultSet = ps.executeQuery()) {
-                    if (resultSet.next()) {
-                        replyNo = resultSet.getInt(1);
-                    } else {
-                        throw new IncorrectResultSizeDataAccessException("while getting getReplyIDIncrement, mid=" + mid, 1, 0);
-                    }
-                }
-            }
-            try (PreparedStatement ps = conn.prepareStatement("UPDATE messages SET maxreplyid=? WHERE message_id=?")) {
-                ps.setInt(1, replyNo);
-                ps.setInt(2, mid);
-                if (ps.executeUpdate() != 1) {
-                    throw new IncorrectResultSizeDataAccessException("Cannot find a message to update: " + mid, 1, 0);
-                }
-            }
-            conn.commit();
-            return replyNo;
-        });
-
-    }
-
-    public static boolean recommendMessage(JdbcTemplate sql, int mid, int vuid) {
-        boolean res = sql.update("INSERT IGNORE INTO favorites(user_id,message_id) VALUES (" + vuid + "," + mid + ")") == 1;
-        if (res) {
-            sql.update("UPDATE messages SET likes=likes+1 WHERE message_id=?", mid);
-        }
-        return res;
-    }
-
-    public static boolean canViewThread(JdbcTemplate sql, int mid, int uid) {
-        PrivacyOpts privacyOpts;
-        try {
-            privacyOpts = sql.queryForObject("SELECT user_id,privacy FROM messages WHERE messages.message_id=?",
-                    (rs, rowNum) -> {
-                        PrivacyOpts res = new PrivacyOpts();
-                        res.setUid(rs.getInt(1));
-                        res.setPrivacy(rs.getInt(2));
-                        return res;
-                    }, mid);
-        } catch (EmptyResultDataAccessException e) {
-            return true;
-        }
-        return privacyOpts.getPrivacy() >= 0
-                || uid == privacyOpts.getUid()
-                || ((privacyOpts.getPrivacy() == -1 || privacyOpts.getPrivacy() == -2) && uid > 0
-                && UserQueries.isInWL(sql, privacyOpts.getUid(), uid));
-    }
-
-    public static boolean isReadOnly(JdbcTemplate sql, int mid) {
-        try {
-            return sql.queryForObject("SELECT readonly FROM messages WHERE message_id=?", new Object[]{mid}, Integer.class) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    public static boolean isSubscribed(JdbcTemplate sql, int uid, int mid) {
-        try {
-            return sql.queryForObject("SELECT 1 FROM subscr_messages WHERE suser_id=? AND message_id=?", new Object[]{uid, mid}, Integer.class) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    public static int getMessagePrivacy(JdbcTemplate sql, int mid) {
-        try {
-            return sql.queryForObject("SELECT privacy FROM messages WHERE message_id=?", new Object[]{mid}, Integer.class);
-        } catch (EmptyResultDataAccessException e) {
-            return -4;
-        }
-    }
-
-
-    public static com.juick.Message getMessage(JdbcTemplate sql, int mid) {
-        try {
-            return sql.queryForObject("SELECT messages.message_id, 0 as rid, 0 as replyto, "
-                            + "messages.user_id,users.nick, 0 as banned, "
-                            + "TIMESTAMPDIFF(MINUTE,messages.ts,NOW()),"
-                            + "messages.ts,"
-                            + "messages.readonly,messages.privacy,messages.replies,"
-                            + "messages.attach,messages.place_id,messages.lat,"
-                            + "messages.lon,messages.likes,messages.hidden,"
-                            + "txt.tags,txt.repliesby,txt.txt, '' as q FROM messages "
-                            + "INNER JOIN users ON messages.user_id=users.id "
-                            + "INNER JOIN messages_txt AS txt "
-                            + "ON messages.message_id=txt.message_id "
-                            + "WHERE messages.message_id=?",
-                    new MessageMapper(), mid);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    public static com.juick.Message getReply(JdbcTemplate sql, int mid, int rid) {
-        try {
-            return sql.queryForObject("SELECT replies.user_id,users.nick,"
-                            + "replies.replyto,replies.ts,"
-                            + "replies.attach,replies.txt, IFNULL(q.txt,t.txt) as quote FROM replies INNER JOIN users "
-                            + "ON replies.user_id=users.id "
-                            + "LEFT JOIN replies q "
-                            + "ON replies.message_id=q.message_id and replies.replyto=q.reply_id "
-                            + "LEFT JOIN messages_txt t ON replies.message_id=t.message_id "
-                            + "WHERE replies.message_id=? AND replies.reply_id=?",
-                    (rs, num) -> {
-                        Message msg = new Message();
-                        msg.setMid(mid);
-                        msg.setRid(rid);
-                        msg.setUser(new User());
-                        msg.getUser().setUid(rs.getInt(1));
-                        msg.getUser().setName(rs.getString(2));
-                        msg.setReplyto(rs.getInt(3));
-                        msg.setDate(rs.getTimestamp(4));
-                        msg.AttachmentType = rs.getString(5);
-                        msg.setText(rs.getString(6));
-                        String quote = rs.getString(7);
-                        if (!StringUtils.isEmpty(quote)) {
-                            msg.setReplyQuote(MessageUtils.formatQuote(quote));
-                        }
-                        return msg;
-                    }, mid, rid);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    public static User getMessageAuthor(JdbcTemplate sql, int mid) {
-        try {
-            return sql.queryForObject("SELECT messages.user_id,users.nick "
-                            + "FROM messages INNER JOIN users "
-                            + "ON messages.user_id=users.id WHERE messages.message_id=?",
-                    new Object[]{mid}, (rs, num) -> {
-                        User res = new com.juick.User();
-                        res.setUid(rs.getInt(1));
-                        res.setName(rs.getString(2));
-                        return res;
-                    });
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    public static List<com.juick.Tag> getMessageTags(JdbcTemplate sql, int mid) {
-        return sql.query("SELECT tags.tag_id,synonym_id,name,stat_messages FROM tags " +
-                        "INNER JOIN messages_tags ON (messages_tags.message_id=? AND messages_tags.tag_id=tags.tag_id)",
-                new Object[]{mid}, (rs, num) -> {
-                    com.juick.Tag t = new com.juick.Tag(StringEscapeUtils.unescapeHtml4(rs.getString(3)));
-                    t.TID = rs.getInt(1);
-                    t.SynonymID = rs.getInt(2);
-                    t.UsageCnt = rs.getInt(4);
-                    return t;
-                });
-    }
-
-    public static List<Integer> getMessageTagsIDs(JdbcTemplate sql, int mid) {
-        return sql.queryForList("SELECT tag_id FROM messages_tags WHERE message_id=?", new Object[] {mid}, Integer.class);
-    }
-
-    public static List<String> getMessageRecommendations(JdbcTemplate sql, int mid) {
-        return sql.queryForList("SELECT users.nick FROM favorites INNER JOIN users " +
-                "ON (favorites.message_id=? AND favorites.user_id=users.id)",
-                new Object[] {mid}, String.class);
-    }
-
-    public static List<Integer> getAll(JdbcTemplate sql, int visitor_uid, int before) {
-        if (visitor_uid > 1) {
-            if (before > 0) {
-                return sql.queryForList("SELECT message_id FROM messages WHERE message_id<? AND hidden=0" +
-                                " AND (privacy>0 OR user_id=?) AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?)" +
-                                " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
-                        new Object[]{before, visitor_uid, visitor_uid}, Integer.class);
-            } else {
-                return sql.queryForList("SELECT message_id FROM messages WHERE hidden=0" +
-                                " AND (privacy>0 OR user_id=?)" +
-                                " AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?)" +
-                                " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
-                        new Object[]{visitor_uid, visitor_uid}, Integer.class);
-            }
-        } else {
-            if (before > 0) {
-                return sql.queryForList("SELECT message_id FROM messages WHERE message_id<?" +
-                                " AND hidden=0 AND privacy>0 AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
-                                " ORDER BY message_id DESC LIMIT 20",
-                        new Object[]{before}, Integer.class);
-            } else {
-                return sql.queryForList("SELECT message_id FROM messages WHERE hidden=0 AND privacy>0" +
-                                " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
-                        Integer.class);
-            }
-        }
-    }
-
-    public static List<Integer> getTag(JdbcTemplate sql, int tid, int visitor_uid, int before, int cnt) {
-        if (before > 0) {
-            return sql.queryForList("SELECT message_id FROM (tags INNER JOIN messages_tags " +
-                            "ON ((tags.synonym_id=? OR tags.tag_id=?) AND tags.tag_id=messages_tags.tag_id)) " +
-                            "INNER JOIN messages USING(message_id) WHERE messages.message_id<? " +
-                            "AND (messages.privacy>0 OR messages.user_id=?) ORDER BY message_id DESC LIMIT ?",
-                    new Object[]{tid, tid, before, visitor_uid, cnt}, Integer.class);
-        } else {
-            return sql.queryForList("SELECT message_id FROM (tags INNER JOIN messages_tags " +
-                            "ON ((tags.synonym_id=? OR tags.tag_id=?) AND tags.tag_id=messages_tags.tag_id)) " +
-                            "INNER JOIN messages USING(message_id) WHERE messages.privacy>0 OR messages.user_id=? " +
-                            "ORDER BY message_id DESC LIMIT ?",
-                    new Object[]{tid, tid, visitor_uid, cnt}, Integer.class);
-        }
-    }
-
-    public static List<Integer> getTags(JdbcTemplate sql, String tids, int visitor_uid, int before, int cnt) {
-        if (before > 0) {
-            return sql.queryForList("SELECT messages.message_id FROM messages_tags " +
-                    "INNER JOIN messages USING(message_id) WHERE messages_tags.tag_id IN (" + tids + ") " +
-                    "AND messages.message_id<? AND (messages.privacy>0 OR messages.user_id=?) " +
-                    "ORDER BY messages.message_id DESC LIMIT ?", new Object[]{before, visitor_uid, cnt}, Integer.class);
-        } else {
-            return sql.queryForList("SELECT messages.message_id FROM messages_tags " +
-                    "INNER JOIN messages USING(message_id) WHERE messages_tags.tag_id IN (" + tids + ") " +
-                    "AND (messages.privacy>0 OR messages.user_id=?) " +
-                    "ORDER BY messages.message_id DESC LIMIT ?", new Object[]{visitor_uid, cnt}, Integer.class);
-        }
-    }
-
-    public static List<Integer> getPlace(JdbcTemplate sql, int place_id, int visitor_uid, int before) {
-        if (before > 0) {
-            return sql.queryForList("SELECT message_id FROM messages WHERE place_id=? AND message_id<? " +
-                            "AND (privacy>0 OR user_id=?) ORDER BY message_id DESC LIMIT 20",
-                    new Object[]{place_id, before, visitor_uid}, Integer.class);
-        } else {
-            return sql.queryForList("SELECT message_id FROM messages WHERE place_id=? AND (privacy>0 OR user_id=?) " +
-                    "ORDER BY message_id DESC LIMIT 20", new Object[]{place_id, visitor_uid}, Integer.class);
-        }
-    }
-
-    public static List<Integer> getMyFeed(JdbcTemplate sql, int uid, int before) {
-        List<Integer> mids;
-        if (before > 0) {
-            mids = sql.queryForList("SELECT message_id FROM messages " +
-                            "INNER JOIN subscr_users ON (subscr_users.suser_id=? AND subscr_users.user_id=messages.user_id) " +
-                            "WHERE message_id<? AND (privacy>=0 OR (privacy>=-2 AND privacy<=-1 AND messages.user_id " +
-                            "IN (SELECT user_id FROM wl_users WHERE wl_user_id=?))) ORDER BY message_id DESC LIMIT 20",
-                    Integer.class, uid, before, uid);
-        } else {
-            mids = sql.queryForList("SELECT message_id FROM messages " +
-                            "INNER JOIN subscr_users ON (subscr_users.suser_id=? " +
-                            "AND subscr_users.user_id=messages.user_id) " +
-                            "WHERE (privacy>=0 OR (privacy>=-2 AND privacy<=-1 AND messages.user_id " +
-                            "IN (SELECT user_id FROM wl_users WHERE wl_user_id=?))) ORDER BY message_id DESC LIMIT 20",
-                    Integer.class, uid, uid);
-        }
-
-
-        if (before > 0) {
-            mids.addAll(sql.queryForList("SELECT message_id FROM messages " +
-                            "WHERE user_id=? AND message_id<? ORDER BY message_id DESC LIMIT 20", Integer.class,
-                    uid, before));
-        } else {
-            mids.addAll(sql.queryForList("SELECT message_id FROM messages " +
-                            "WHERE user_id=? ORDER BY message_id DESC LIMIT 20", Integer.class, uid));
-        }
-
-        Collections.sort(mids, Collections.reverseOrder());
-        int remove = mids.size() - 20;
-        for (int i = 0; i < remove; i++) {
-            mids.remove(20);
-        }
-
-        return mids;
-    }
-
-    public static List<Integer> getPrivate(JdbcTemplate sql, int uid, int before) {
-
-        if (before > 0) {
-            return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND privacy<0 AND message_id<? " +
-                    "ORDER BY message_id DESC LIMIT 20", new Object[]{uid, before}, Integer.class);
-        } else {
-            return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND privacy<0 " +
-                    "ORDER BY message_id DESC LIMIT 20", new Object[]{uid}, Integer.class);
-        }
-    }
-
-    public static List<Integer> getDiscussions(JdbcTemplate sql, int uid, int before) {
-        if (before > 0) {
-            return sql.queryForList("SELECT message_id FROM subscr_messages WHERE suser_id=? AND message_id<? " +
-                    "ORDER BY message_id DESC LIMIT 20", Integer.class, uid, before);
-        } else {
-            return sql.queryForList("SELECT message_id FROM subscr_messages WHERE suser_id=? " +
-                    "ORDER BY message_id DESC LIMIT 20", Integer.class, uid);
-        }
-    }
-
-    public static List<Integer> getRecommended(JdbcTemplate sql, int uid, int before) {
-        if (before > 0) {
-            return sql.queryForList("SELECT message_id FROM favorites WHERE user_id " +
-                    "IN (SELECT user_id FROM subscr_users WHERE suser_id=?) AND message_id<? " +
-                    "ORDER BY message_id DESC LIMIT 20", Integer.class, uid, before);
-        } else {
-            return sql.queryForList("SELECT message_id FROM favorites WHERE user_id " +
-                    "IN (SELECT user_id FROM subscr_users WHERE suser_id=?) " +
-                    "ORDER BY message_id DESC LIMIT 20", Integer.class, uid);
-        }
-    }
-
-    public static List<Integer> getPopular(JdbcTemplate sql, int visitor_uid, int before) {
-
-            if (before > 0) {
-                return sql.queryForList("SELECT message_id FROM messages WHERE message_id<? AND privacy>0 " +
-                        "AND popular>0 AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                        "ORDER BY message_id DESC LIMIT 20", Integer.class, before, visitor_uid);
-            } else {
-                return sql.queryForList("SELECT message_id FROM messages WHERE privacy>0 " +
-                        "AND popular>0 AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                        "ORDER BY message_id DESC LIMIT 20", Integer.class, visitor_uid);
-            }
-    }
-
-    public static List<Integer> getPhotos(JdbcTemplate sql, int visitor_uid, int before) {
-        if (before > 0) {
-            return sql.queryForList("SELECT message_id FROM messages WHERE message_id<? AND (privacy>0 OR user_id=?) " +
-                    "AND attach IS NOT NULL AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
-                    "AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                    "ORDER BY message_id DESC LIMIT 20", Integer.class, before, visitor_uid, visitor_uid);
-        } else {
-            return sql.queryForList("SELECT message_id FROM messages WHERE (privacy>0 OR user_id=?) " +
-                    "AND attach IS NOT NULL AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
-                    "AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                    "ORDER BY message_id DESC LIMIT 20", Integer.class, visitor_uid, visitor_uid);
-        }
-    }
-
-    public static List<Integer> getSearch(JdbcTemplate sql, JdbcTemplate sqlSearch, String search, int before) {
-        List<Integer> mids;
-
-        if (before > 0) {
-            mids = sqlSearch.queryForList("SELECT id AS message_id FROM messages WHERE MATCH(?) AND id<? " +
-                    "ORDER BY id DESC LIMIT 25", Integer.class, search, before);
-        } else {
-            mids = sqlSearch.queryForList("SELECT id AS message_id FROM messages WHERE MATCH(?) " +
-                    "ORDER BY id DESC LIMIT 25", Integer.class, search);
-        }
-        if (mids.size() > 0) {
-            return sql.queryForList("SELECT message_id FROM messages WHERE message_id " +
-                    "IN (" + StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") AND privacy>0 ORDER BY message_id DESC LIMIT 20",
-                    Integer.class);
-        }
-        return mids;
-    }
-
-    public static List<Integer> getUserBlog(JdbcTemplate sql, int UID, int privacy, int before) {
-        if (before > 0) {
-            return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND message_id<? AND privacy>=" +
-                    privacy + " ORDER BY message_id DESC LIMIT 20", Integer.class, UID, before);
-        } else {
-            return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND privacy>=" + privacy +
-                    " ORDER BY message_id DESC LIMIT 20", Integer.class, UID);
-        }
-    }
-
-    public static List<Integer> getUserTag(JdbcTemplate sql, int UID, int TID, int privacy, int before) {
-        if (before > 0) {
-            return sql.queryForList("SELECT messages.message_id FROM messages_tags INNER JOIN messages " +
-                    "USING(message_id) WHERE messages.user_id=? AND messages_tags.tag_id=? " +
-                    "AND messages.message_id<? AND messages.privacy>=" + privacy +
-                    " ORDER BY messages.message_id DESC LIMIT 20",
-                    Integer.class, UID, TID, before);
-        } else {
-            return sql.queryForList("SELECT messages.message_id FROM messages_tags INNER JOIN messages " +
-                    "USING(message_id) WHERE messages.user_id=? AND messages_tags.tag_id=? " +
-                    "AND messages.privacy>=" + privacy + " ORDER BY messages.message_id DESC LIMIT 20",
-                    Integer.class, UID, TID);
-        }
-    }
-
-    public static List<Integer> getUserRecommendations(JdbcTemplate sql, int UID, int before) {
-        if (before > 0) {
-            return sql.queryForList("SELECT message_id FROM favorites "
-                    + "WHERE user_id=? AND message_id<? "
-                    + "ORDER BY message_id DESC LIMIT 20", Integer.class,
-                    UID, before);
-        } else {
-            return sql.queryForList("SELECT message_id FROM favorites "
-                    + "WHERE user_id=? ORDER BY message_id DESC LIMIT 20",
-                    Integer.class, UID);
-        }
-    }
-
-    public static List<Integer> getUserPhotos(JdbcTemplate sql, int UID, int privacy, int before) {
-        if (before > 0) {
-            return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND message_id<? AND privacy>=" +
-                    privacy + " AND attach IS NOT NULL ORDER BY message_id DESC LIMIT 20",
-                    new Object[] {UID, before}, Integer.class);
-        } else {
-            return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND privacy>=" + privacy +
-                    " AND attach IS NOT NULL ORDER BY message_id DESC LIMIT 20",
-                    new Object[] {UID}, Integer.class);
-        }
-    }
-
-    public static List<Integer> getUserSearch(JdbcTemplate sql, JdbcTemplate sqlSearch, int UID, String search, int privacy, int before) {
-        List<Integer> mids;
-
-
-        if (before > 0) {
-            mids = sqlSearch.queryForList("SELECT id AS message_id FROM messages WHERE user_id=? AND MATCH(?) AND id<? " +
-                    "ORDER BY id DESC LIMIT 20", new Object[] {UID, search, before}, Integer.class);
-        } else {
-            mids = sqlSearch.queryForList("SELECT id AS message_id FROM messages WHERE user_id=? AND MATCH(?) " +
-                    "ORDER BY id DESC LIMIT 20", new Object[] {UID, search}, Integer.class);
-        }
-
-        if (mids.size() > 0) {
-           return sql.queryForList("SELECT message_id FROM messages WHERE message_id IN (" +
-                           StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") AND privacy>=" + privacy + " ORDER BY message_id DESC",
-                   Integer.class);
-        }
-        return mids;
-    }
-
-    public static List<com.juick.Message> getMessages(JdbcTemplate sql, List<Integer> mids) {
-        if (!mids.isEmpty()) {
-            return sql.query("SELECT messages.message_id, 0 as rid, 0 as replyto, "
-                    + "messages.user_id,users.nick, 0 as banned, "
-                    + "TIMESTAMPDIFF(MINUTE,messages.ts,NOW()),"
-                    + "messages.ts,"
-                    + "messages.readonly,messages.privacy,messages.replies,"
-                    + "messages.attach,messages.place_id,messages.lat,"
-                    + "messages.lon,messages.likes,messages.hidden,"
-                    + "messages_txt.tags,messages_txt.repliesby, messages_txt.txt, '' as q "
-                    + "FROM (messages INNER JOIN messages_txt "
-                    + "ON messages.message_id=messages_txt.message_id) "
-                    + "INNER JOIN users ON messages.user_id=users.id "
-                    + "WHERE messages.message_id "
-                    + "IN (" + StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") "
-                    + "ORDER BY messages.message_id DESC", new MessageMapper());
-        }
-        return Collections.emptyList();
-    }
-
-    public static List<com.juick.Message> getReplies(JdbcTemplate sql, int mid) {
-        return sql.query("SELECT ? as mid, replies.reply_id,replies.replyto, " +
-                        "replies.user_id,users.nick,users.banned, " +
-                        "TIMESTAMPDIFF(MINUTE,replies.ts,NOW()),replies.ts," +
-                        "0 as readonly, 0 as privacy, 0 as replies," +
-                        "replies.attach, 0 as place_id, 0 as lat," +
-                        "0 as lon, 0 as likes, 0 as hidden," +
-                        "NULL as tags,NULL as repliesby, replies.txt, " +
-                        "IFNULL(qw.txt, t.txt) as q " +
-                        "FROM replies INNER JOIN users " +
-                        "ON replies.user_id=users.id " +
-                        "LEFT JOIN replies qw ON replies.message_id=qw.message_id and replies.replyto=qw.reply_id " +
-                        "LEFT JOIN messages_txt t on replies.message_id=t.message_id " +
-                        "WHERE replies.message_id=? " +
-                        "ORDER BY replies.reply_id ASC",
-                new MessageMapper(), mid, mid);
-    }
-
-    public static boolean setMessagePopular(JdbcTemplate sql, int mid, int popular) {
-        boolean ret;
-        switch (popular) {
-            case -2:
-                ret = sql.update("UPDATE messages SET hidden=1 WHERE message_id=?", mid) > 0;
-                break;
-            case -1:
-                ret = sql.update("UPDATE messages SET popular=0 WHERE message_id=?", mid) > 0;
-                break;
-            default:
-                ret = sql.update("UPDATE messages SET popular=? WHERE message_id=?", popular, mid) > 0;
-                break;
-        }
-        if (popular == -1) {
-            ret = sql.update("INSERT INTO top_ignore_messages VALUES (?)", mid) > 0;
-        }
-        return ret;
-    }
-
-    public static boolean setMessagePrivacy(JdbcTemplate sql, int mid) {
-        return sql.update("UPDATE messages SET privacy=1 WHERE message_id=?", 
-                mid) > 0;            
-    }
-    public static boolean deleteMessage(JdbcTemplate sql, int uid, int mid) {
-        if (sql.update("DELETE FROM messages WHERE message_id=? AND user_id=?", mid, uid) > 0) {
-            sql.update("DELETE FROM messages_txt WHERE message_id=?", mid);
-            sql.update("DELETE FROM replies WHERE message_id=?", mid);
-            sql.update("DELETE FROM subscr_messages WHERE message_id=?", mid);
-            sql.update("DELETE FROM messages_tags WHERE message_id=?", mid);
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/PMQueries.java b/server-core/src/main/java/com/juick/server/PMQueries.java
deleted file mode 100644
index c79c04b6..00000000
--- a/server-core/src/main/java/com/juick/server/PMQueries.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import com.juick.User;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import java.util.List;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class PMQueries {
-
-    public static boolean createPM(JdbcTemplate sql, int uid_from, int uid_to, String body) {
-        boolean ret = sql.update("INSERT INTO pm(user_id,user_id_to,txt) VALUES (?,?,?)",
-                uid_from, uid_to, body) > 0;
-
-        if (ret) {
-            sql.update("INSERT INTO pm_streams(user_id,user_id_to,lastmessage,unread) "
-                    + "VALUES (?,?,NOW(),1) "
-                    + "ON DUPLICATE KEY UPDATE lastmessage=NOW(),unread=unread+1",
-                    uid_from, uid_to);
-        }
-        return ret;
-    }
-
-    public static boolean addPMinRoster(JdbcTemplate sql, int uid, String jid) {
-        return sql.update("INSERT INTO pm_inroster(user_id,jid) VALUES (?,?)",
-                uid, jid) > 0;
-    }
-
-    public static boolean removePMinRoster(JdbcTemplate sql, int uid, String jid) {
-        return sql.update("DELETE FROM pm_inroster WHERE user_id=? AND jid=?", uid, jid) > 0;
-    }
-
-    public static boolean havePMinRoster(JdbcTemplate sql, int uid, String jid) {
-        List<Integer> res = sql.queryForList("SELECT 1 FROM pm_inroster "
-                + "WHERE user_id=? AND jid=?", Integer.class,
-                uid, jid);
-            return res.size() > 0;        
-    }
-
-    public static String getLastView(JdbcTemplate sql, int uid_from, int uid_to) {
-        try {
-            return sql.queryForObject("SELECT lastview FROM pm_streams WHERE user_id=? AND user_id_to=?", String.class,
-                    uid_from, uid_to);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    public static List<User> getPMLastConversationsUsers(JdbcTemplate sql, int uid, int cnt) {
-        return sql.query("SELECT pm_streams.user_id, users.nick, pm_streams.unread FROM pm_streams "
-                + "INNER JOIN users ON users.id = pm_streams.user_id "
-                + "WHERE pm_streams.user_id_to=? "
-                + "ORDER BY pm_streams.unread DESC, pm_streams.lastmessage DESC LIMIT " + cnt, (rs, rowNum) -> {
-            com.juick.User u = new com.juick.User();
-            u.setUid(rs.getInt(1));
-            u.setName(rs.getString(2));
-            u.setUnreadCount(rs.getInt(3));
-            return u;
-        }, uid);
-    }
-
-    public static List<com.juick.Message> getPMMessages(JdbcTemplate sql, int uid, int uid_to) {
-        List<com.juick.Message> msgs = sql.query("SELECT user_id,txt,ts FROM pm "
-                + "WHERE (user_id=? AND user_id_to=?) "
-                + "OR (user_id_to=? AND user_id=?) ORDER BY ts DESC LIMIT 20",
-                (rs, rowNum) -> {
-                    com.juick.Message msg = new com.juick.Message();
-                    int uuid = rs.getInt(1);
-                    msg.setUser(new User());
-                    msg.getUser().setUid(uuid);
-                    msg.setText(rs.getString(2));
-                    msg.setDate(rs.getTimestamp(3));
-                    return msg;
-                }, uid, uid_to, uid, uid_to);
-
-        sql.update("UPDATE pm_streams SET lastview=NOW(),unread=0 "
-                + "WHERE user_id_to=? AND user_id=?", uid, uid_to);
-
-        return msgs;
-    }
-
-    public static List<com.juick.Message> getLastPMInbox(JdbcTemplate sql, int uid) {
-        return sql.query("SELECT pm.user_id,users.nick,pm.txt,TIMESTAMPDIFF(MINUTE,pm.ts,NOW()),pm.ts " +
-                        "FROM pm INNER JOIN users ON pm.user_id=users.id WHERE pm.user_id_to=? ORDER BY pm.ts DESC LIMIT 20",
-                (rs, num) -> {
-                    com.juick.Message msg = new com.juick.Message();
-                    msg.setUser(new User());
-                    msg.getUser().setUid(rs.getInt(1));
-                    msg.getUser().setName(rs.getString(2));
-                    msg.setText(rs.getString(3));
-                    msg.TimeAgo = rs.getInt(4);
-                    msg.setDate(rs.getTimestamp(5));
-                    return msg;
-                }, uid);
-    }
-
-    public static List<com.juick.Message> getLastPMSent(JdbcTemplate sql, int uid) {
-        return sql.query("SELECT pm.user_id_to,users.nick,pm.txt,TIMESTAMPDIFF(MINUTE,pm.ts,NOW())," +
-                        "pm.ts FROM pm INNER JOIN users ON pm.user_id_to=users.id " +
-                        "WHERE pm.user_id=? ORDER BY pm.ts DESC LIMIT 20",
-                (rs, num) -> {
-                    com.juick.Message msg = new com.juick.Message();
-                    msg.setUser(new User());
-                    msg.getUser().setUid(rs.getInt(1));
-                    msg.getUser().setName(rs.getString(2));
-                    msg.setText(rs.getString(3));
-                    msg.TimeAgo = rs.getInt(4);
-                    msg.setDate(rs.getTimestamp(5));
-                    return msg;
-                }, uid);
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/PrivacyQueries.java b/server-core/src/main/java/com/juick/server/PrivacyQueries.java
deleted file mode 100644
index 40fc82c4..00000000
--- a/server-core/src/main/java/com/juick/server/PrivacyQueries.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.juick.server;
-
-import com.juick.Tag;
-import com.juick.User;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-/**
- * Created by vitalyster on 19.10.2016.
- */
-public class PrivacyQueries {
-    public enum PrivacyResult {
-        Removed, Added
-    }
-    public static PrivacyResult blacklistUser(JdbcTemplate jdbc, User user, User target) {
-        int result = jdbc.update("DELETE FROM bl_users WHERE user_id=? AND bl_user_id=?", user.getUid(), target.getUid());
-        if (result > 0) {
-            return PrivacyResult.Removed;
-        } else {
-            jdbc.update("INSERT INTO bl_users(user_id,bl_user_id) VALUES (?,?)", user.getUid(), target.getUid());
-            return PrivacyResult.Added;
-        }
-    }
-    public static PrivacyResult blacklistTag(JdbcTemplate jdbc, User user, Tag tag) {
-        int result = jdbc.update("DELETE FROM bl_tags WHERE user_id=? AND tag_id=?", user.getUid(), tag.TID);
-        if (result > 0) {
-            return PrivacyResult.Removed;
-        } else {
-            jdbc.update("INSERT INTO bl_tags(user_id,tag_id) VALUES (?,?)", user.getUid(), tag.TID);
-            return PrivacyResult.Added;
-        }
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/PushQueries.java b/server-core/src/main/java/com/juick/server/PushQueries.java
deleted file mode 100644
index 904b3c0d..00000000
--- a/server-core/src/main/java/com/juick/server/PushQueries.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.juick.server;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-
-/**
- *
- * @author ugnich
- */
-public class PushQueries {
-
-    public static List<String> getAndroidRegID(JdbcTemplate sql, int uid) {
-        return sql.queryForList("SELECT regid FROM android WHERE user_id=?", String.class, uid);
-    }
-
-    public static  List<String> getAndroidTokens(JdbcTemplate sql, List<Integer> uids) {
-        return sql.queryForList("SELECT regid FROM android INNER JOIN users " +
-                "ON (users.id=android.user_id) WHERE users.id IN (" + StringUtils.collectionToCommaDelimitedString(uids) + ")", String.class);
-    }
-
-    public static  List<String> getWinPhoneURL(JdbcTemplate sql, int uid) {
-        return sql.queryForList("SELECT url FROM winphone WHERE user_id=?", String.class, uid);
-    }
-
-    public static  List<String> getWindowsTokens(JdbcTemplate sql, List<Integer> uids) {
-        return sql.queryForList("SELECT url FROM winphone INNER JOIN users " +
-                "ON (users.id=winphone.user_id) WHERE users.id IN (" + StringUtils.collectionToCommaDelimitedString(uids) + ")", String.class);
-    }
-
-    public static  List<String> getAPNSToken(JdbcTemplate sql, int uid) {
-        return sql.queryForList("SELECT token from ios WHERE user_id=?", String.class, uid);
-    }
-
-    public static  List<String> getAPNSTokens(JdbcTemplate sql, List<Integer> uids) {
-        return sql.queryForList("SELECT token FROM ios INNER JOIN users " +
-                "ON (users.id=ios.user_id) WHERE users.id IN (" + StringUtils.collectionToCommaDelimitedString(uids) + ")", String.class);
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/ShowQueries.java b/server-core/src/main/java/com/juick/server/ShowQueries.java
deleted file mode 100644
index fde388c3..00000000
--- a/server-core/src/main/java/com/juick/server/ShowQueries.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.juick.server;
-
-import com.juick.User;
-
-import java.util.List;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-/**
- * Created by vt on 10/01/16.
- */
-public class ShowQueries {
-
-    public static List<String> getRecommendedUsers(JdbcTemplate sql, User forUser) {
-        return sql.queryForList("SELECT users.nick FROM subscr_users INNER JOIN users " +
-                    "ON subscr_users.user_id=users.id " +
-                    "WHERE subscr_users.user_id NOT IN (SELECT user_id FROM subscr_users WHERE suser_id=?) " +
-                    "AND subscr_users.suser_id IN (SELECT user_id FROM subscr_users WHERE suser_id=?) " +
-                    "AND subscr_users.user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                    "AND subscr_users.user_id!=? AND users.lastmessage>UNIX_TIMESTAMP()-259200 " +
-                    "GROUP BY subscr_users.user_id ORDER BY count(*) DESC LIMIT 10", 
-                String.class, forUser.getUid(), forUser.getUid(), forUser.getUid(), forUser.getUid());
-    }
-
-    public static List<String> getTopUsers(JdbcTemplate sql) {
-        return sql.queryForList("SELECT users.nick,COUNT(subscr_users.suser_id) AS cnt " +
-                    "FROM (subscr_users INNER JOIN users ON subscr_users.user_id=users.id) " +
-                    "INNER JOIN useroptions ON users.id=useroptions.user_id " +
-                    "WHERE useroptions.privacy_view>0 AND users.lastmessage>UNIX_TIMESTAMP()-259200 " +
-                    "AND users.id!=2 GROUP BY subscr_users.user_id ORDER BY cnt DESC LIMIT 10",
-                String.class);            
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java b/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java
deleted file mode 100644
index 08d704d9..00000000
--- a/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.juick.server;
-
-import com.juick.Tag;
-import com.juick.User;
-import com.juick.server.helpers.NotifyOpts;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.util.StringUtils;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- *
- * @author ugnich
- */
-public class SubscriptionsQueries {
-
-    public static List<String> getJIDSubscribedToUser(JdbcTemplate sql, int uid, boolean friendsonly) {
-        if (friendsonly == false) {
-            return sql.queryForList("SELECT jids.jid FROM subscr_users INNER JOIN jids " +
-                            "ON (subscr_users.user_id=? AND subscr_users.suser_id=jids.user_id) WHERE jids.active=1",
-                    String.class, uid);
-        } else {
-            return sql.queryForList("SELECT jids.jid FROM subscr_users INNER JOIN jids " +
-                    "ON (subscr_users.user_id=? AND subscr_users.suser_id=jids.user_id) WHERE jids.active=1 " +
-                    "AND jids.user_id IN (SELECT wl_user_id FROM wl_users WHERE user_id=?)", String.class, uid, uid);
-        }
-    }
-
-    public static List<User> getSubscribedUsers(JdbcTemplate sql, int uid, int mid) {
-        User author = MessagesQueries.getMessageAuthor(sql, mid);
-        List<User> userids = UserQueries.getUserReaders(sql, uid);
-        Set<Integer> set = new HashSet<>();
-        set.addAll(userids.stream().map(User::getUid).collect(Collectors.toList()));
-        List<Integer> tags = MessagesQueries.getMessageTagsIDs(sql, mid);
-        if (tags.size() > 0) {
-            List<Integer> tagUsers = sql.queryForList("SELECT suser_id FROM subscr_tags " +
-                    "WHERE tag_id IN (" + StringUtils.arrayToCommaDelimitedString(tags.toArray()) + ") AND suser_id!=? " +
-                    " AND suser_id NOT IN (SELECT user_id FROM bl_users WHERE bl_user_id=?)", Integer.class, uid, author.getUid());
-            set.addAll(tagUsers);
-        }
-        return UserQueries.getUsersByID(sql, new ArrayList<>(set));
-    }
-
-    public static List<User> getUsersSubscribedToComments(JdbcTemplate sql, int mid, int ignore_uid) {
-        List<Integer> userids = sql.queryForList("SELECT suser_id FROM subscr_messages WHERE message_id=? AND suser_id!=?",
-                Integer.class, mid, ignore_uid);
-        if (userids.size() > 0) {
-            return UserQueries.getUsersByID(sql, userids);
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    public static List<User> getUsersSubscribedToUserRecommendations(JdbcTemplate sql, int uid, int mid, int muid) {
-        List<Integer> tags = MessagesQueries.getMessageTagsIDs(sql, mid);
-
-            String query = "SELECT suser_id FROM subscr_users WHERE user_id=" + uid;
-            query += " AND user_id NOT IN (SELECT user_id FROM bl_users WHERE bl_user_id=" + muid + ")";
-            query += " AND user_id NOT IN (SELECT suser_id FROM subscr_users WHERE user_id=" + muid + ")";
-            query += " AND user_id NOT IN (SELECT suser_id FROM subscr_messages WHERE message_id=" + mid + ")";
-            query += " AND user_id NOT IN (SELECT user_id FROM favorites WHERE message_id=" + mid + ")";
-            query += " AND user_id NOT IN (SELECT subscr_users.suser_id FROM subscr_users INNER JOIN favorites ON (favorites.message_id=" + mid + " AND subscr_users.user_id=favorites.user_id AND favorites.user_id!=" + uid + "))";
-            if (!tags.isEmpty()) {
-                String tagsStr = StringUtils.arrayToCommaDelimitedString(tags.toArray());
-                query += " AND user_id NOT IN (SELECT suser_id FROM subscr_tags WHERE tag_id IN (" + tagsStr + "))";
-                query += " AND user_id NOT IN (SELECT user_id FROM bl_tags WHERE tag_id IN (" + tagsStr + "))";
-            }
-        List<Integer> userids = sql.queryForList(query, Integer.class);
-        return UserQueries.getUsersByID(sql, userids);
-    }
-
-    public static boolean subscribeMessage(JdbcTemplate sql, int mid, int vuid) {
-        return sql.update("INSERT IGNORE INTO subscr_messages(suser_id,message_id) VALUES (" + vuid + "," + mid + ")") == 1;
-    }
-    public static boolean unSubscribeMessage(JdbcTemplate sql, int mid, int vuid) {
-        return sql.update("DELETE FROM subscr_messages WHERE message_id=? AND suser_id=?",
-                mid, vuid) > 0;
-    }
-    public static boolean subscribeUser(JdbcTemplate sql, User user, User toUser) {
-        return sql.update("INSERT IGNORE INTO subscr_users(user_id,suser_id) VALUES (?,?)",
-                toUser.getUid(), user.getUid()) == 1;
-    }
-    public static boolean unSubscribeUser(JdbcTemplate sql, User user, User fromUser) {
-        return sql.update("DELETE FROM subscr_users WHERE suser_id=? AND user_id=?",
-                user.getUid(), fromUser.getUid()) > 0;
-    }
-    public static boolean subscribeTag(JdbcTemplate sql, User user, Tag toTag) {
-        return sql.update("INSERT IGNORE INTO subscr_tags(tag_id,suser_id) VALUES (?,?)",
-                toTag.TID, user.getUid()) == 1;
-    }
-    public static boolean unSubscribeTag(JdbcTemplate sql, User user, Tag toTag) {
-        return sql.update("DELETE FROM subscr_tags WHERE tag_id=? AND suser_id=?",
-                toTag.TID, user.getUid()) > 0;
-    }
-
-    public static NotifyOpts getNotifyOptions(JdbcTemplate sql, User user) {
-        try {
-            return sql.queryForObject("SELECT jnotify,subscr_notify,recommendations FROM useroptions WHERE user_id=?",
-                    (rs, num) -> {
-                        NotifyOpts options = new NotifyOpts();
-                        options.setRepliesEnabled(rs.getInt(1) > 0);
-                        options.setSubscriptionsEnabled(rs.getInt(2) > 0);
-                        options.setRecommendationsEnabled(rs.getInt(3) > 0);
-                        return options;
-                    }, user.getUid());
-        } catch (EmptyResultDataAccessException e) {
-            return new NotifyOpts();
-        }
-    }
-
-    public static boolean setNotifyOptions(JdbcTemplate sql, User user, NotifyOpts options) {
-        return sql.update("UPDATE useroptions SET jnotify=? WHERE user_id=?", options.isRepliesEnabled() ? 1 : 0,
-                user.getUid()) > 0 &&
-                sql.update("UPDATE useroptions SET subscr_notify=? WHERE user_id=?", options.isSubscriptionsEnabled() ? 1 : 0,
-                        user.getUid()) > 0 &&
-                sql.update("UPDATE useroptions SET recommendations=? WHERE user_id=?", options.isRecommendationsEnabled() ? 1 : 0,
-                        user.getUid()) > 0;
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/TagQueries.java b/server-core/src/main/java/com/juick/server/TagQueries.java
deleted file mode 100644
index ee9a1e21..00000000
--- a/server-core/src/main/java/com/juick/server/TagQueries.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import com.juick.Tag;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-
-import java.sql.PreparedStatement;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class TagQueries {
-
-    public static com.juick.Tag getTag(JdbcTemplate sql, int tid) {
-        try {
-            return sql.queryForObject("SELECT synonym_id,name FROM tags WHERE tag_id=?",
-                    (rs, num) -> {
-                        Tag ret = new Tag(StringEscapeUtils.unescapeHtml4(rs.getString(2)));
-                        ret.TID = tid;
-                        ret.SynonymID = rs.getInt(1);
-                        return ret;
-                    }, tid);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    public static com.juick.Tag getTag(JdbcTemplate sql, String tag, boolean autoCreate) {
-        Tag ret = null;
-        try {
-            ret = sql.queryForObject("SELECT tag_id,synonym_id,name FROM tags WHERE name=?",
-                    (rs, rowNum) -> {
-                        Tag ret1 = new Tag(StringEscapeUtils.unescapeHtml4(rs.getString(3)));
-                        ret1.TID = rs.getInt(1);
-                        ret1.SynonymID = rs.getInt(2);
-                        return ret1;
-                    }, StringEscapeUtils.escapeHtml4(tag));
-        } catch (EmptyResultDataAccessException e) {
-            // tag not found
-        }
-        if (ret == null && autoCreate) {
-            ret = new com.juick.Tag(tag);
-            ret.TID = createTag(sql, tag);
-        }
-
-        return ret;
-    }
-
-    public static List<com.juick.Tag> getTags(JdbcTemplate sql, String[] tags, boolean autoCreate) {
-        List<Tag> ret = new ArrayList<>();
-
-        for (String tag : tags) {
-            if (!tag.isEmpty()) {
-                Tag t = getTag(sql, tag, autoCreate);
-                if (t != null) {
-                    ret.add(t);
-                }
-            }
-        }
-
-        return ret;
-    }
-
-    public static boolean getTagNoIndex(JdbcTemplate sql, int tag_id) {
-        try {
-            return sql.queryForObject("SELECT noindex FROM tags WHERE tag_id=?", Integer.class, tag_id) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    public static int createTag(JdbcTemplate sql, String name) {
-        KeyHolder holder = new GeneratedKeyHolder();
-        sql.update(con -> {
-            PreparedStatement stmt = con.prepareStatement("INSERT INTO tags(name) VALUES (?)",
-                    Statement.RETURN_GENERATED_KEYS);
-                stmt.setString(1, StringEscapeUtils.escapeHtml4(name));
-                return stmt;
-        }, holder);
-
-        return holder.getKey().intValue();
-    }
-
-    public static List<com.juick.Tag> getUserTagsAll(JdbcTemplate sql, int uid) {
-        return sql.query("SELECT tags.name,COUNT(messages.message_id) " +
-                        "FROM (messages INNER JOIN messages_tags ON (messages.user_id=? " +
-                        "AND messages.message_id=messages_tags.message_id)) " +
-                        "INNER JOIN tags ON messages_tags.tag_id=tags.tag_id GROUP BY tags.tag_id ORDER BY tags.name ASC",
-                (rs, rowNum) -> {
-                    Tag t = new Tag(StringEscapeUtils.unescapeHtml4(rs.getString(1)));
-                    t.UsageCnt = rs.getInt(2);
-                    return t;
-                }, uid);
-    }
-
-    public static List<String> getUserBLTags(JdbcTemplate sql, int uid) {
-        return sql.queryForList("SELECT tags.name FROM tags INNER JOIN bl_tags " +
-                        "ON (bl_tags.user_id=? AND bl_tags.tag_id=tags.tag_id) ORDER BY tags.name",
-                String.class, uid);
-    }
-
-    public static List<String> getPopularTags(JdbcTemplate sql) {
-        return sql.queryForList("SELECT name FROM tags WHERE top=1 ORDER BY name ASC", String.class).stream()
-                .map(StringEscapeUtils::unescapeHtml4).collect(Collectors.toList());
-    }
-    public static List<Tag> updateTags(JdbcTemplate sql, int mid, List<Tag> newTags) {
-        List<Tag> currentTags = MessagesQueries.getMessageTags(sql, mid);
-        newTags.stream().filter(currentTags::contains)
-                .forEach(t -> sql.update("DELETE FROM messages_tags WHERE message_id=? AND tag_id=?", mid, t.TID));
-        newTags.stream().filter(t -> !currentTags.contains(t))
-                .forEach(t -> sql.update("INSERT INTO messages_tags(message_id,tag_id) VALUES (?,?)", mid, t.TID));
-        return MessagesQueries.getMessageTags(sql, mid);
-    }
-
-    public static List<Tag> fromString(JdbcTemplate sql, String txt, boolean tagsOnly) {
-        String patternString = tagsOnly ? "^(?:(?:\\*[^ \\r\\n\\t]+)|\\s)+$" : "^\\*([^ \\r\\n\\t]+)\\s+([\\s\\S]+)";
-        Pattern tagsPattern = Pattern.compile(patternString);
-        if (tagsPattern.matcher(txt).matches()) {
-            Pattern tagPattern = Pattern.compile("\\*([^ \\r\\n\\t]+)");
-            Matcher tagMatcher = tagPattern.matcher(txt);
-            List<Tag> tags = new ArrayList<>();
-            // TODO: process readonly, private, friends, public
-            while (tagMatcher.find()) {
-                for (int i = 1; i <= tagMatcher.groupCount(); i++) {
-                    tags.add(getTag(sql, tagMatcher.group(i), true));
-                }
-            }
-            return tags;
-        }
-        return Collections.emptyList();
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/UserQueries.java b/server-core/src/main/java/com/juick/server/UserQueries.java
deleted file mode 100644
index 7400e6b2..00000000
--- a/server-core/src/main/java/com/juick/server/UserQueries.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import com.juick.User;
-import com.juick.server.helpers.Auth;
-import com.juick.server.helpers.EmailOpts;
-import com.juick.server.helpers.UserInfo;
-import com.juick.util.UserUtils;
-import org.springframework.dao.DuplicateKeyException;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.util.StringUtils;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.*;
-
-/**
- * @author Ugnich Anton
- */
-public class UserQueries {
-
-    static final String ABCDEF = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-    public static class UserMapper implements RowMapper<User> {
-        @Override
-        public User mapRow(ResultSet rs, int rowNum) throws SQLException {
-            User user = new User();
-            user.setUid(rs.getInt(1));
-            user.setName(rs.getString(2));
-            user.setBanned(rs.getBoolean(3));
-            return user;
-        }
-    }
-
-    public static String getSignUpHashByJID(JdbcTemplate sql, String jid) {
-        String hash;
-        try {
-            hash = sql.queryForObject("SELECT loginhash FROM jids WHERE jid=? AND user_id IS NULL",
-                    String.class, jid);
-        } catch (EmptyResultDataAccessException e) {
-            hash = UUID.randomUUID().toString();
-            sql.update("INSERT INTO jids(jid,loginhash) VALUES (?,?)", jid, hash);
-        }
-        return hash;
-    }
-
-    public static String getSignUpHashByTelegramID(JdbcTemplate sql, Long telegramId, String username) {
-        try {
-            return sql.queryForObject("SELECT loginhash FROM telegram WHERE tg_id=? AND user_id IS NULL",
-                    String.class, telegramId);
-        } catch (EmptyResultDataAccessException e) {
-            String hash = UUID.randomUUID().toString();
-            sql.update("INSERT INTO telegram(tg_id, loginhash, tg_name) VALUES (?, ?, ?)", telegramId, hash, username);
-            return hash;
-        }
-    }
-
-    public static int createUser(JdbcTemplate sql, String username, String password) {
-        KeyHolder holder = new GeneratedKeyHolder();
-        try {
-            sql.update(con -> {
-                PreparedStatement stmt = con.prepareStatement("INSERT INTO users(nick,passw) VALUES (?,?)",
-                        Statement.RETURN_GENERATED_KEYS);
-                stmt.setString(1, username);
-                stmt.setString(2, password);
-                return stmt;
-            }, holder);
-        } catch (DuplicateKeyException e) {
-            return -1;
-        }
-
-        int uid = holder.getKey().intValue();
-
-        sql.update("INSERT INTO useroptions(user_id) VALUES (?)", uid);
-        sql.update("INSERT INTO subscr_users(user_id,suser_id) VALUES (2,?)", uid);
-
-        return uid;
-    }
-
-    public static Optional<User> getUserByUID(JdbcTemplate sql, int uid) {
-        try {
-            return Optional.of(sql.queryForObject("SELECT id, nick,banned FROM users WHERE id=?",
-                    new UserMapper(), uid));
-        } catch (EmptyResultDataAccessException e) {
-            return Optional.empty();
-        }
-    }
-
-    public static User getUserByName(JdbcTemplate sql, String username) {
-        try {
-            return sql.queryForObject("SELECT id,nick,banned FROM users WHERE nick=?",
-                    new UserMapper(),
-                    username);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    public static User getUserByJID(JdbcTemplate sql, String jid) {
-        try {
-            return sql.queryForObject("SELECT id,nick,banned FROM users WHERE id=(SELECT user_id FROM jids WHERE jid=?)",
-                    new UserMapper(), jid);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    public static List<User> getUsersByName(JdbcTemplate sql, List<String> unames) {
-        if (!unames.isEmpty()) {
-            return sql.query("SELECT id,nick,banned FROM users WHERE nick IN (\"" + StringUtils.arrayToDelimitedString(unames.toArray(), "\",\"") + "\")",
-                    new UserMapper());
-        }
-        return Collections.emptyList();
-    }
-
-    public static List<User> getUsersByID(JdbcTemplate sql, List<Integer> uids) {
-        if (!uids.isEmpty()) {
-            return sql.query("SELECT id,nick,banned FROM users WHERE id IN (" + StringUtils.arrayToCommaDelimitedString(uids.toArray()) + ")",
-                    new UserMapper());
-        }
-        return Collections.emptyList();
-    }
-
-    public static List<com.juick.User> getUsersByJID(JdbcTemplate sql, List<String> jids) {
-        if (!jids.isEmpty()) {
-            return sql.query("SELECT users.id,users.nick,jids.jid FROM users "
-                            + "INNER JOIN jids ON jids.user_id=users.id "
-                            + "WHERE jids.jid IN (\"" + StringUtils.arrayToDelimitedString(jids.toArray(), "\",\"") + "\")",
-                    (rs, rowNum) -> {
-                        com.juick.User user = new com.juick.User();
-                        user.setUid(rs.getInt(1));
-                        user.setName(rs.getString(2));
-                        user.setJID(rs.getString(3));
-                        return user;
-                    });
-        }
-        return Collections.emptyList();
-    }
-
-    public static List<String> getJIDsbyUID(JdbcTemplate sql, int uid) {
-        return sql.queryForList("SELECT jid FROM jids WHERE user_id=? AND active=1", String.class, uid);
-    }
-
-    public static int getUIDbyJID(JdbcTemplate sql, String jid) {
-        try {
-            return sql.queryForObject("SELECT user_id FROM jids WHERE jid=?", Integer.class, jid);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    public static int getUIDbyName(JdbcTemplate sql, String uname) {
-        try {
-            return sql.queryForObject("SELECT id FROM users WHERE nick=?", Integer.class, uname);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    public static int getUIDbyHash(JdbcTemplate sql, String hash) {
-        try {
-            return sql.queryForObject("SELECT user_id FROM logins WHERE hash=?", Integer.class, hash);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    public static com.juick.User getUserByHash(JdbcTemplate sql, String hash) {
-        try {
-            User user = sql.queryForObject("SELECT logins.user_id,users.nick, users.banned FROM logins " +
-                            "INNER JOIN users ON logins.user_id=users.id WHERE logins.hash=?",
-                    new UserMapper(), hash);
-            user.setAuthHash(hash);
-            return user;
-        } catch (EmptyResultDataAccessException e) {
-            return new User();
-        }
-    }
-
-    public static String getHashByUID(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT hash FROM logins WHERE user_id=?", String.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            String hash = UserUtils.generateHash(16);
-            sql.update(con -> {
-                PreparedStatement stmt = con.prepareStatement("INSERT INTO logins(user_id,hash) VALUES (?,?)");
-                stmt.setInt(1, uid);
-                stmt.setString(2, hash);
-                return stmt;
-            });
-            return hash;
-        }
-    }
-
-    public static int checkPassword(JdbcTemplate sql, String username, String password) {
-        try {
-            String realPassword = sql.queryForObject("SELECT passw FROM users WHERE nick=?", String.class, username);
-            if (realPassword.equals(password)) {
-                User user = UserQueries.getUserByName(sql, username);
-                if (user != null) {
-                    return user.getUid();
-                } else {
-                    return -1;
-                }
-            } else {
-                return -1;
-            }
-        } catch (EmptyResultDataAccessException e) {
-            return -1;
-        }
-    }
-
-    public static boolean updatePassword(JdbcTemplate sql, User user, String newPassword) {
-        return user.getUid() > 0 && sql.update("UPDATE users SET passw=? WHERE id=?", newPassword, user.getUid()) > 0;
-    }
-
-    public static String updateSecretEmail(JdbcTemplate sql, User user) {
-        String newHash = UserUtils.generateHash(16);
-        if (sql.update("INSERT INTO mail(user_id,hash) VALUES (?,?) ON DUPLICATE KEY UPDATE hash=?", user.getUid(), newHash, newHash) > 0) {
-            return newHash;
-        }
-        return "";
-    }
-
-    public static int getUserOptionInt(JdbcTemplate sql, int uid, String option, int defaultValue) {
-        try {
-            return sql.queryForObject("SELECT " + option + " FROM useroptions WHERE user_id=?", Integer.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return defaultValue;
-        }
-    }
-
-    public static void setUserOptionInt(JdbcTemplate sql, int uid, String option, int value) {
-        sql.update("UPDATE useroptions SET " + option + "=? WHERE user_id=?", value, uid);
-    }
-
-    public static UserInfo getUserInfo(JdbcTemplate sql, User user) {
-        try {
-            return sql.queryForObject("SELECT fullname,country,url,descr FROM usersinfo WHERE user_id=?", ((rs, rowNum) -> {
-                UserInfo info = new UserInfo();
-                info.setFullName(rs.getString(1));
-                info.setCountry(rs.getString(2));
-                info.setUrl(rs.getString(3));
-                info.setDescription(rs.getString(4));
-                return info;
-            }), user.getUid());
-        } catch (EmptyResultDataAccessException e) {
-            return new UserInfo();
-        }
-    }
-
-    public static boolean updateUserInfo(JdbcTemplate sql, User user, UserInfo info) {
-        return sql.update("INSERT INTO usersinfo(user_id,fullname,country,url,descr) VALUES (?,?,?,?,?) " +
-                        "ON DUPLICATE KEY UPDATE fullname=?,country=?,url=?,descr=?", user.getUid(), info.getFullName(),
-                info.getCountry(), info.getUrl(), info.getDescription(), info.getFullName(),
-                info.getCountry(), info.getUrl(), info.getDescription()) > 0;
-    }
-
-    public static boolean getCanMedia(JdbcTemplate sql, int uid) {
-        try {
-            int res = sql.queryForObject("SELECT users.lastphoto-UNIX_TIMESTAMP() FROM users WHERE id=?",
-                    Integer.class, uid);
-            return res < 3600;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    public static boolean isInWL(JdbcTemplate sql, int uid, int check) {
-        try {
-            return sql.queryForObject("SELECT 1 FROM wl_users WHERE user_id=? AND wl_user_id=?",
-                    Integer.class, uid, check) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    public static boolean isInBL(JdbcTemplate sql, int uid, int check) {
-        try {
-            return sql.queryForObject("SELECT 1 FROM bl_users WHERE user_id=? AND bl_user_id=?",
-                    Integer.class, uid, check) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    public static boolean isInBLAny(JdbcTemplate sql, int uid, int uid2) {
-        try {
-            return sql.queryForObject("SELECT 1 FROM bl_users "
-                    + "WHERE (user_id=? AND bl_user_id=?) "
-                    + "OR (user_id=? AND bl_user_id=?)", new Object[]{uid, uid2, uid2, uid}, Integer.class) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    public static List<Integer> checkBL(JdbcTemplate sql, int visitor, List<Integer> uids) {
-        if (!uids.isEmpty()) {
-            return sql.queryForList("SELECT user_id FROM bl_users WHERE bl_user_id=? and user_id IN (" +
-                    StringUtils.collectionToCommaDelimitedString(uids) + ")", Integer.class, visitor);
-        } else {
-            return new ArrayList<>();
-        }
-    }
-
-    public static boolean isSubscribed(JdbcTemplate sql, int uid, int check) {
-        try {
-            return sql.queryForObject("SELECT 1 FROM subscr_users WHERE suser_id=? AND user_id=?",
-                    Integer.class, uid, check) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    public static List<Integer> getUserRead(JdbcTemplate sql, int uid) {
-        return sql.queryForList("SELECT user_id FROM subscr_users WHERE suser_id=?", Integer.class, uid);
-    }
-
-    public static List<com.juick.User> getUserReadLeastPopular(JdbcTemplate sql, int uid, int cnt) {
-        return sql.query("SELECT users.id,users.nick FROM (subscr_users " +
-                        "INNER JOIN users_subscr ON (subscr_users.suser_id=? " +
-                        "AND subscr_users.user_id=users_subscr.user_id)) INNER JOIN users " +
-                        "ON subscr_users.user_id=users.id ORDER BY cnt LIMIT ?",
-                (rs, num) -> {
-                    com.juick.User u = new com.juick.User();
-                    u.setUid(rs.getInt(1));
-                    u.setName(rs.getString(2));
-                    return u;
-                }, uid, cnt);
-    }
-
-    public static List<User> getUserReaders(JdbcTemplate sql, int uid) {
-        return sql.query("SELECT users.id, users.nick FROM subscr_users " +
-                        "INNER JOIN users ON subscr_users.suser_id=users.id " +
-                        "WHERE subscr_users.user_id=? ORDER BY users.nick",
-                (rs, num) -> {
-                    com.juick.User u = new com.juick.User();
-                    u.setUid(rs.getInt(1));
-                    u.setName(rs.getString(2));
-                    return u;
-                }, uid);
-    }
-
-    public static List<User> getUserFriends(JdbcTemplate sql, int uid) {
-        return sql.query("SELECT users.id,users.nick FROM subscr_users " +
-                        "INNER JOIN users ON subscr_users.user_id=users.id " +
-                        "WHERE subscr_users.suser_id=? AND users.id!=? " +
-                        "ORDER BY users.nick",
-                (rs, num) -> {
-                    com.juick.User u = new com.juick.User();
-                    u.setUid(rs.getInt(1));
-                    u.setName(rs.getString(2));
-                    return u;
-                }, uid, uid);
-    }
-
-    public static List<com.juick.User> getUserBLUsers(JdbcTemplate sql, int uid) {
-        return sql.query("SELECT users.id,users.nick FROM users INNER JOIN bl_users " +
-                        "ON(bl_users.bl_user_id=users.id) WHERE bl_users.user_id=? ORDER BY users.nick",
-                (rs, num) -> {
-                    com.juick.User u = new com.juick.User();
-                    u.setUid(rs.getInt(1));
-                    u.setName(rs.getString(2));
-                    return u;
-                }, uid);
-    }
-
-    public static boolean linkTwitterAccount(JdbcTemplate sql, User user, String accessToken,
-                                             String accessTokenSecret, String screenName) {
-        if (sql.update("INSERT INTO twitter(user_id,access_token,access_token_secret,uname) " +
-                        "VALUES (?,?,?,?)" +
-                        " ON DUPLICATE KEY UPDATE access_token=?,access_token_secret=?,uname=?",
-                user.getUid(), accessToken, accessTokenSecret, screenName, accessToken, accessTokenSecret, screenName) > 0) {
-            return sql.update("INSERT INTO subscr_users(user_id,suser_id,jid) " +
-                    "VALUES (?,1741,'juick\\@twitter.juick.com')", user.getUid()) > 0;
-        }
-        return false;
-
-    }
-
-    public static int getStatsIRead(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT COUNT(*) FROM subscr_users WHERE suser_id=?", Integer.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    public static int getStatsMyReaders(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT COUNT(*) FROM subscr_users WHERE user_id=?", Integer.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    public static int getStatsMessages(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT COUNT(*) FROM messages WHERE user_id=?", Integer.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    public static int getStatsReplies(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT COUNT(*) FROM replies WHERE user_id=?", Integer.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    public enum ActiveStatus {
-        Inactive,
-        Active
-    }
-
-    public static boolean setActiveStatusForJID(JdbcTemplate sql, String JID, ActiveStatus jidStatus) {
-        User user = getUserByJID(sql, JID);
-        if (user != null) {
-            return sql.update(con -> {
-                PreparedStatement preparedStatement = con.prepareStatement(
-                        "UPDATE jids SET active=? WHERE user_id=? AND jid=?");
-                int newStatus = jidStatus == ActiveStatus.Active ? 1 : 0;
-                preparedStatement.setInt(1, newStatus);
-                preparedStatement.setInt(2, user.getUid());
-                preparedStatement.setString(3, JID);
-                return preparedStatement;
-
-            }) >= 0;
-        }
-        return false;
-    }
-
-    public static List<String> getAllJIDs(JdbcTemplate sql, User user) {
-        return sql.queryForList("SELECT jid FROM jids WHERE user_id=?", String.class, user.getUid());
-    }
-
-    public static List<Auth> getAuthCodes(JdbcTemplate sql, User user) {
-        return sql.query("SELECT account,authcode FROM auth WHERE user_id=? AND protocol='xmpp'",
-                (rs, num) -> new Auth(rs.getString(1), rs.getString(2)), user.getUid());
-    }
-
-    public static List<String> getEmails(JdbcTemplate sql, User user) {
-        return sql.queryForList("SELECT email FROM emails WHERE user_id=?", String.class, user.getUid());
-    }
-
-    public static EmailOpts getEmailOpts(JdbcTemplate sql, User user) {
-        try {
-            return sql.queryForObject("SELECT email,subscr_hour FROM emails WHERE user_id=? AND subscr_hour IS NOT NULL",
-                    (rs, num) -> new EmailOpts(rs.getString(1), rs.getInt(2)), user.getUid());
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    public static String getEmailHash(JdbcTemplate sql, User user) {
-        try {
-            return sql.queryForObject("SELECT hash FROM mail WHERE user_id=?", String.class, user.getUid())
-                    + "@mail.juick.com";
-        } catch (EmptyResultDataAccessException e) {
-            return "";
-        }
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java b/server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java
deleted file mode 100644
index 61109c47..00000000
--- a/server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.juick.server.helpers;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * Created by vt on 03/09/16.
- */
-public class ApplicationStatus {
-    private boolean connected;
-    private boolean crosspostEnabled;
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this)
-                .append("connected", connected)
-                .append("crosspostEnabled", crosspostEnabled)
-                .toString();
-    }
-
-    public boolean isConnected() {
-        return connected;
-    }
-
-    public void setConnected(boolean connected) {
-        this.connected = connected;
-    }
-
-    public boolean isCrosspostEnabled() {
-        return crosspostEnabled;
-    }
-
-    public void setCrosspostEnabled(boolean crosspostEnabled) {
-        this.crosspostEnabled = crosspostEnabled;
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/helpers/Auth.java b/server-core/src/main/java/com/juick/server/helpers/Auth.java
deleted file mode 100644
index 3e1f0bd9..00000000
--- a/server-core/src/main/java/com/juick/server/helpers/Auth.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.juick.server.helpers;
-
-/**
- * Created by vt on 09/02/16.
- */
-public class Auth {
-    private String account;
-    private String authCode;
-
-    public Auth(String account, String authCode) {
-        this.account = account;
-        this.authCode = authCode;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public String getAuthCode() {
-        return authCode;
-    }
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/com/juick/server/helpers/EmailOpts.java b/server-core/src/main/java/com/juick/server/helpers/EmailOpts.java
deleted file mode 100644
index 679d1a8d..00000000
--- a/server-core/src/main/java/com/juick/server/helpers/EmailOpts.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.juick.server.helpers;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * Created by vitalyster on 09.02.2016.
- */
-public class EmailOpts {
-    private String email;
-    private String subscriptionHour;
-
-    public EmailOpts(String email, int subscriptionHour) {
-        this.email = email;
-        this.subscriptionHour = StringUtils.leftPad(String.format("%d", subscriptionHour), 2, "0");
-    }
-
-    public String getSubscriptionHour() {
-        return subscriptionHour;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java b/server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java
deleted file mode 100644
index 377b0a50..00000000
--- a/server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.juick.server.helpers;
-
-/**
- * Created by vt on 03/09/16.
- */
-public class NotifyOpts {
-    private boolean repliesEnabled;
-    private boolean subscriptionsEnabled;
-    private boolean recommendationsEnabled;
-
-    public boolean isRepliesEnabled() {
-        return repliesEnabled;
-    }
-
-    public void setRepliesEnabled(boolean repliesEnabled) {
-        this.repliesEnabled = repliesEnabled;
-    }
-
-    public boolean isSubscriptionsEnabled() {
-        return subscriptionsEnabled;
-    }
-
-    public void setSubscriptionsEnabled(boolean subscriptionsEnabled) {
-        this.subscriptionsEnabled = subscriptionsEnabled;
-    }
-
-    public boolean isRecommendationsEnabled() {
-        return recommendationsEnabled;
-    }
-
-    public void setRecommendationsEnabled(boolean recommendationsEnabled) {
-        this.recommendationsEnabled = recommendationsEnabled;
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java b/server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java
deleted file mode 100644
index 66cf9410..00000000
--- a/server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.juick.server.helpers;
-
-/**
- * Created by vt on 16/01/16.
- */
-public class PrivacyOpts {
-    private int uid;
-    private int privacy;
-
-    public PrivacyOpts() {
-
-    }
-
-    public int getUid() {
-        return uid;
-    }
-
-    public void setUid(int uid) {
-        this.uid = uid;
-    }
-
-    public int getPrivacy() {
-        return privacy;
-    }
-
-    public void setPrivacy(int privacy) {
-        this.privacy = privacy;
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/helpers/Status.java b/server-core/src/main/java/com/juick/server/helpers/Status.java
deleted file mode 100644
index f68baae5..00000000
--- a/server-core/src/main/java/com/juick/server/helpers/Status.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.juick.server.helpers;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * Created by vitalyster on 25.07.2016.
- */
-public class Status {
-    private String value;
-
-    public Status(String value) {
-        this.value = value;
-    }
-
-    @JsonProperty("status")
-    public String getValue() {
-        return value;
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/helpers/UserInfo.java b/server-core/src/main/java/com/juick/server/helpers/UserInfo.java
deleted file mode 100644
index 5a4b6894..00000000
--- a/server-core/src/main/java/com/juick/server/helpers/UserInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.juick.server.helpers;
-
-/**
- * Created by vt on 03/09/16.
- */
-public class UserInfo {
-    private String fullName;
-    private String country;
-    private String url;
-    private String description;
-
-    public String getFullName() {
-        return fullName;
-    }
-
-    public void setFullName(String fullName) {
-        this.fullName = fullName;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java b/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java
deleted file mode 100644
index 6fa3790e..00000000
--- a/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java
+++ /dev/null
@@ -1,458 +0,0 @@
-package com.juick.server.protocol;
-
-import com.juick.Message;
-import com.juick.Tag;
-import com.juick.User;
-import com.juick.formatters.PlainTextFormatter;
-import com.juick.json.MessageSerializer;
-import com.juick.server.*;
-import com.juick.server.protocol.annotation.UserCommand;
-import com.juick.util.TagUtils;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * Created by oxpa on 22.03.16.
- */
-
-public class JuickProtocol {
-    MessageSerializer json = new MessageSerializer();
-    JdbcTemplate sql;
-    String baseUri;
-
-    public JuickProtocol(JdbcTemplate sql, String baseUri) {
-        this.sql = sql;
-        this.baseUri = baseUri;
-    }
-
-    /**
-     * find command by pattern and invoke
-     * @param user who send command
-     * @param userInput given by user
-     * @return command result
-     * @throws InvocationTargetException
-     * @throws IllegalAccessException
-     * @throws NoSuchMethodException
-     */
-    public ProtocolReply getReply(User user, String userInput) throws InvocationTargetException,
-            IllegalAccessException, NoSuchMethodException {
-        Optional<Method> cmd =  Arrays.stream(getClass().getDeclaredMethods())
-                .filter(m -> m.isAnnotationPresent(UserCommand.class))
-                .filter(m -> Pattern.compile(m.getAnnotation(UserCommand.class).pattern(),
-                        m.getAnnotation(UserCommand.class).patternFlags()).matcher(userInput).matches())
-                .findFirst();
-        if (!cmd.isPresent()) {
-            // default command - post as new message
-            return postMessage(user, userInput);
-        } else {
-            Matcher matcher = Pattern.compile(cmd.get().getAnnotation(UserCommand.class).pattern(),
-                    cmd.get().getAnnotation(UserCommand.class).patternFlags()).matcher(userInput);
-            List<String> groups = new ArrayList<>();
-            while (matcher.find()) {
-                for (int i = 1; i <= matcher.groupCount(); i++) {
-                    groups.add(matcher.group(i));
-                }
-            }
-            return (ProtocolReply) getClass().getMethod(cmd.get().getName(), User.class, String[].class)
-                    .invoke(this, user, groups.toArray(new String[groups.size()]));
-        }
-    }
-
-    public ProtocolReply postMessage(User user, String input) {
-        List<Tag> tags = TagQueries.fromString(sql, input, false);
-        String body = input.substring(TagUtils.toString(tags).length());
-        int mid = MessagesQueries.createMessage(sql, user.getUid(), body, null, tags);
-        SubscriptionsQueries.subscribeMessage(sql, mid, user.getUid());
-        //app.events().publishEvent(new JuickMessageEvent(app.messages().getMessage(mid)));
-        return new ProtocolReply("New message posted.\n#" + mid + " " + baseUri + mid,
-                Optional.of(json.serializeList(Collections.singletonList(MessagesQueries.getMessage(sql, mid)))));
-    }
-
-    @UserCommand(pattern = "^#(\\++)$", help = "#+ - Show last Juick messages (#++ - second page, ...)")
-    public ProtocolReply commandLast(User user, String... arguments) {
-        // number of + is the page count
-        int page = arguments[0].length() - 1;
-        List<Integer> mids = MessagesQueries.getAll(sql, user.getUid(), page);
-        List<Message> messages = MessagesQueries.getMessages(sql, mids);
-        return new ProtocolReply("Last messages: \n" + String.join("\n", messages.stream().map(PlainTextFormatter::formatPost)
-                .collect(Collectors.toList())), Optional.of(json.serializeList(messages)));
-    }
-
-    @UserCommand(pattern = "^\\s*bl\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "BL - Show your blacklist")
-    public ProtocolReply commandBL(User user_from, String... arguments) {
-        List<User> blusers;
-        List<String> bltags;
-
-        blusers = UserQueries.getUserBLUsers(sql, user_from.getUid());
-        bltags = TagQueries.getUserBLTags(sql, user_from.getUid());
-
-
-        String txt = "";
-        if (bltags.size() > 0) {
-            for (String bltag : bltags) {
-                txt += "*" + bltag + "\n";
-            }
-
-            if (blusers.size() > 0) {
-                txt += "\n";
-            }
-        }
-        if (blusers.size() > 0) {
-            for (User bluser : blusers) {
-                txt += "@" + bluser.getName() + "\n";
-            }
-        }
-        if (txt.isEmpty()) {
-            txt = "You don't have any users or tags in your blacklist.";
-        }
-        return new ProtocolReply(txt, Optional.empty());
-    }
-
-    @UserCommand(pattern = "^bl\\s+@([^\\s\\n\\+]+)", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "BL @username - add @username to your blacklist")
-    public ProtocolReply blacklistUser(User from, String... arguments) {
-        User blUser = UserQueries.getUserByName(sql, arguments[0]);
-        if (blUser != null) {
-            PrivacyQueries.PrivacyResult result = PrivacyQueries.blacklistUser(sql, from, blUser);
-            if (result == PrivacyQueries.PrivacyResult.Added) {
-                return new ProtocolReply("User added to your blacklist", Optional.empty());
-            } else {
-                return new ProtocolReply("User removed from your blacklist", Optional.empty());
-            }
-        }
-        return new ProtocolReply("User not found", Optional.empty());
-    }
-
-    @UserCommand(pattern = "^bl\\s\\*(\\S+)$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "BL *tag - add *tag to your blacklist")
-    public ProtocolReply blacklistTag(User from, String... arguments) {
-        User blUser = UserQueries.getUserByName(sql, arguments[0]);
-        if (blUser != null) {
-            Tag tag = TagQueries.getTag(sql, arguments[0], false);
-            if (tag != null) {
-                PrivacyQueries.PrivacyResult result = PrivacyQueries.blacklistTag(sql, from, tag);
-                if (result == PrivacyQueries.PrivacyResult.Added) {
-                    return new ProtocolReply("Tag added to your blacklist", Optional.empty());
-                } else {
-                    return new ProtocolReply("Tag removed from your blacklist", Optional.empty());
-                }
-            }
-        }
-        return new ProtocolReply("Tag not found", Optional.empty());
-    }
-
-    @UserCommand(pattern = "@", help = "@ - Show recommendations and popular personal blogs")
-    public ProtocolReply commandUsers(User currentUser, String... args) {
-        StringBuilder msg = new StringBuilder();
-        msg.append("Recommended blogs");
-        List<String> recommendedUsers = ShowQueries.getRecommendedUsers(sql, currentUser);
-        if (recommendedUsers.size() > 0) {
-            for (String user : recommendedUsers) {
-                msg.append("\n@").append(user);
-            }
-        } else {
-            msg.append("\nNo recommendations now. Subscribe to more blogs. ;)");
-        }
-        msg.append("\n\nTop 10 personal blogs:");
-        List<String> topUsers = ShowQueries.getTopUsers(sql);
-        if (topUsers.size() > 0) {
-            for (String user : topUsers) {
-                msg.append("\n@").append(user);
-            }
-        } else {
-            msg.append("\nNo top users. Empty DB? ;)");
-        }
-        return new ProtocolReply(msg.toString(), Optional.empty());
-    }
-
-    @UserCommand(pattern = "\\*", help = "* - Show your tags")
-    public ProtocolReply commandTags(User currentUser, String... args) {
-        List<Tag> tags = TagQueries.getUserTagsAll(sql, currentUser.getUid());
-        String msg = "Your tags: (tag - messages)\n" +
-                tags.stream()
-                        .map(t -> String.format("\n*%s - %d", t.getName(), t.UsageCnt)).collect(Collectors.joining());
-        return new ProtocolReply(msg, Optional.empty());
-    }
-
-    @UserCommand(pattern = "!", help = "! - Show your favorite messages")
-    public ProtocolReply commandFavorites(User currentUser, String... args) {
-        List<Integer> mids = MessagesQueries.getUserRecommendations(sql, currentUser.getUid(), 0);
-        if (mids.size() > 0) {
-            List<Message> messages = MessagesQueries.getMessages(sql, mids);
-            return new ProtocolReply("Favorite messages: \n" + String.join("\n", messages.stream().map(PlainTextFormatter::formatPost)
-                    .collect(Collectors.toList())), Optional.of(json.serializeList(messages)));
-        }
-        return new ProtocolReply("No favorite messages, try to \"like\" something ;)", Optional.empty());
-    }
-
-    @UserCommand(pattern = "^\\@([^\\s\\n\\+]+)(\\+?)$",
-            help = "@username+ - Show user's info and last 10 messages (@username++ - second page, ..)")
-    public ProtocolReply commandUser(User user, String... arguments) {
-        User blogUser = UserQueries.getUserByName(sql, arguments[0]);
-        int page = arguments[1].length();
-        if (blogUser != null) {
-            List<Integer> mids = MessagesQueries.getUserBlog(sql, blogUser.getUid(), 0, page);
-            List<Message> messages = MessagesQueries.getMessages(sql, mids);
-            return new ProtocolReply(String.format("Last messages from @%s:\n%s", arguments[0],
-                    String.join("\n", messages.stream()
-                            .map(Object::toString).collect(Collectors.toList()))),
-                    Optional.of(json.serializeList(messages)));
-        }
-        return new ProtocolReply("User not found", Optional.empty());
-    }
-
-    @UserCommand(pattern = "^\\s*d\\s*\\#([0-9]+)\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "D #12345 - delete the message")
-    public ProtocolReply commandDel(User user, String... args) {
-        try {
-            int mid = Integer.parseInt(args[0]);
-            if (MessagesQueries.deleteMessage(sql, user.getUid(), mid)) {
-                return new ProtocolReply(String.format("Message %s deleted", mid), Optional.empty());
-            }
-        } catch (NumberFormatException e) {
-            return new ProtocolReply("Error", Optional.empty());
-        }
-        return new ProtocolReply("Error", Optional.empty());
-    }
-
-    @UserCommand(pattern = "^\\s*login\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "LOGIN - log in to Juick website")
-    public ProtocolReply commandLogin(User user, String... arguments) {
-        return new ProtocolReply(baseUri + "?" + UserQueries.getHashByUID(sql, user.getUid()),
-                Optional.empty());
-    }
-
-    @UserCommand(pattern = "^(#+)$", help = "# - Show last messages from your feed (## - second page, ...)")
-    public ProtocolReply commandMyFeed(User user, String... arguments) {
-        // number of # is the page count
-        int page = arguments[0].length() - 1;
-        List<Integer> mids = MessagesQueries.getMyFeed(sql, user.getUid(), page);
-        List<Message> messages = MessagesQueries.getMessages(sql, mids);
-        // TODO: add instructions for empty feed
-        return new ProtocolReply("Your feed: \n" + String.join("\n",
-                messages.stream().map(PlainTextFormatter::formatPost).collect(Collectors.toList())),
-                Optional.of(json.serializeList(messages)));
-    }
-
-    @UserCommand(pattern = "^\\s*(on|off)\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "ON/OFF - Enable/disable subscriptions delivery")
-    public ProtocolReply commandOnOff(User user, String[] input) {
-        UserQueries.ActiveStatus newStatus;
-        String retValUpdated;
-        if (input[0].toLowerCase().equals("on")) {
-            newStatus = UserQueries.ActiveStatus.Active;
-            retValUpdated = "Notifications are activated for " + user.getJID();
-        } else {
-            newStatus = UserQueries.ActiveStatus.Inactive;
-            retValUpdated = "Notifications are disabled for " + user.getJID();
-        }
-
-        if (UserQueries.setActiveStatusForJID(sql, user.getJID(), newStatus)) {
-            return new ProtocolReply(retValUpdated, Optional.empty());
-        } else {
-            return new ProtocolReply(String.format("Subscriptions status for %s was not changed", user.getJID()),
-                    Optional.empty());
-        }
-    }
-
-    @UserCommand(pattern = "^\\s*ping\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "PING - returns you a PONG")
-    public ProtocolReply commandPing(User user, String[] input) {
-        return new ProtocolReply("PONG", Optional.empty());
-    }
-
-    @UserCommand(pattern = "^\\@(\\S+)\\s+([\\s\\S]+)$", help = "@username message - send PM to username")
-    public ProtocolReply commandPM(User user_from, String... arguments) {
-        String user_to = arguments[0];
-        String body = arguments[1];
-        int ret = 0;
-
-        int uid_to = 0;
-        String jid_to = null;
-        boolean haveInRoster = false;
-
-        if (user_to.indexOf('@') > 0) {
-            uid_to = UserQueries.getUIDbyJID(sql, user_to);
-        } else {
-            uid_to = UserQueries.getUIDbyName(sql, user_to);
-        }
-
-        if (uid_to > 0) {
-            if (!UserQueries.isInBLAny(sql, uid_to, user_from.getUid())) {
-                if (PMQueries.createPM(sql, user_from.getUid(), uid_to, body)) {
-                    //jid_to = UserQueries.getJIDsbyUID(sql, uid_to);
-                    if (jid_to != null) {
-                        haveInRoster = PMQueries.havePMinRoster(sql, user_from.getUid(), jid_to);
-                    }
-                    ret = 200;
-                } else {
-                    ret = 500;
-                }
-            } else {
-                ret = 403;
-            }
-        } else {
-            ret = 404;
-        }
-
-
-        if (ret == 200) {
-            Message jmsg = new Message();
-            jmsg.setUser(user_from);
-            jmsg.setText(body);
-            // TODO: add PM payload
-            //app.events().publishEvent(new JuickMessageEvent(jmsg));
-            /* TODO: move to XMPP component
-            if (jid_to != null) {
-                Message mm = new Message();
-                mm.to = new JID(jid_to);
-                mm.type = Message.Type.chat;
-                if (haveInRoster) {
-                    mm.from = new JID(user_from.getName(), getDomain(), "Juick");
-                    mm.body = body;
-                } else {
-                    mm.from = new JID("juick", getDomain(), "Juick");
-                    mm.body = "Private message from @" + user_from.getName() + ":\n" + body;
-                }
-                return Collections.singletonList(mm);
-            }
-            */
-        }
-        if (ret == 200) {
-            return new ProtocolReply("Private message sent", Optional.empty());
-        } else {
-            return new ProtocolReply("Error " + ret, Optional.empty());
-        }
-    }
-
-    @UserCommand(pattern = "^#(\\d+)(\\+?)$", help = "#1234 - Show message (#1234+ - message with replies)")
-    public ProtocolReply commandShow(User user, String... arguments) {
-        boolean showReplies = arguments[1].length() > 0;
-        int mid;
-        try {
-            mid = Integer.parseInt(arguments[0]);
-        } catch (NumberFormatException e) {
-            return new ProtocolReply("Error", Optional.empty());
-        }
-        Message msg = MessagesQueries.getMessage(sql, mid);
-        if (msg != null) {
-            if (showReplies) {
-                List<Message> replies = MessagesQueries.getReplies(sql, mid);
-                replies.add(0, msg);
-                return new ProtocolReply(String.join("\n",
-                        replies.stream().map(PlainTextFormatter::formatPost).collect(Collectors.toList())),
-                        Optional.of(json.serializeList(replies)));
-            }
-            return new ProtocolReply(PlainTextFormatter.formatPost(msg), Optional.of(json.serializeList(Collections.singletonList(msg))));
-        }
-        return new ProtocolReply("Message not found", Optional.empty());
-    }
-    @UserCommand(pattern = "^(#|\\.)(\\d+)((\\.|\\-|\\/)(\\d+))?\\s([\\s\\S]+)",
-    help = "#1234 *tag *tag2 - edit tags\n#1234 text - reply to message")
-    public ProtocolReply EditOrReply(User user, String... args) {
-        int mid;
-        try {
-            mid = Integer.parseInt(args[1]);
-        } catch (NumberFormatException e) {
-            return new ProtocolReply("Error", Optional.empty());
-        }
-        int rid;
-        try {
-            rid = Integer.parseInt(args[4]);
-        } catch (NumberFormatException e) {
-            rid = 0;
-        }
-        String txt = args[5];
-        List<Tag> messageTags = TagQueries.fromString(sql, txt, true);
-        if (messageTags.size() > 0) {
-            if (user.getUid() != MessagesQueries.getMessageAuthor(sql, mid).getUid()) {
-                return new ProtocolReply("It is not your message", Optional.empty());
-            }
-            TagQueries.updateTags(sql, mid, messageTags);
-            return new ProtocolReply("Tags are updated", Optional.empty());
-        } else {
-            int newrid = MessagesQueries.createReply(sql, mid, rid, user.getUid(), txt, null);
-            return new ProtocolReply("Reply posted.\n#" + mid + "/" + newrid + " "
-                    + baseUri + mid + "/" + newrid,
-                    Optional.of(json.serializeList(Collections.singletonList(MessagesQueries.getReply(sql, mid, newrid)))));
-        }
-    }
-
-    @UserCommand(pattern = "^(s|u)\\s+#(\\d+)$", help = "S #1234 - subscribe to comments",
-            patternFlags = Pattern.CASE_INSENSITIVE)
-    public ProtocolReply commandSubscribeMessage(User user, String... args) {
-        boolean subscribe = args[0].equalsIgnoreCase("s");
-        int mid;
-        try {
-            mid = Integer.parseInt(args[1]);
-        } catch (NumberFormatException e) {
-            return new ProtocolReply("Error", Optional.empty());
-        }
-        if (subscribe) {
-            if (SubscriptionsQueries.subscribeMessage(sql, mid, user.getUid())) {
-                return new ProtocolReply("Subscribed", Optional.empty());
-            }
-        } else {
-            if (SubscriptionsQueries.unSubscribeMessage(sql, mid, user.getUid())) {
-                return new ProtocolReply("Unsubscribed from #" + mid, Optional.empty());
-            }
-            return new ProtocolReply("You was not subscribed to #" + mid, Optional.empty());
-        }
-        return new ProtocolReply("Error", Optional.empty());
-    }
-    @UserCommand(pattern = "^(s|u)\\s+\\@(\\S+)$", help = "S @user - subscribe to user's posts",
-            patternFlags = Pattern.CASE_INSENSITIVE)
-    public ProtocolReply commandSubscribeUser(User user, String... args) {
-        boolean subscribe = args[0].equalsIgnoreCase("s");
-        User toUser = UserQueries.getUserByName(sql, args[1]);
-        if (toUser.getUid() > 0) {
-            if (subscribe) {
-                if (SubscriptionsQueries.subscribeUser(sql, user, toUser)) {
-                    return new ProtocolReply("Subscribed", Optional.empty());
-                    // TODO: notification
-                    // TODO: already subscribed case
-                }
-            } else {
-                if (SubscriptionsQueries.unSubscribeUser(sql, user, toUser)) {
-                    return new ProtocolReply("Unsubscribed from @" + toUser.getName(), Optional.empty());
-                }
-                return new ProtocolReply("You was not subscribed to @" + toUser.getName(), Optional.empty());
-            }
-        }
-        return new ProtocolReply("Error", Optional.empty());
-    }
-    @UserCommand(pattern = "^(s|u)\\s+\\*(\\S+)$", help = "S *tag - subscribe to tag" +
-            "\nU *tag - unsubscribe from tag", patternFlags = Pattern.CASE_INSENSITIVE)
-    public ProtocolReply commandSubscribeTag(User user, String... args) {
-        boolean subscribe = args[0].equalsIgnoreCase("s");
-        Tag tag = TagQueries.getTag(sql, args[1], true);
-        if (subscribe) {
-            if (SubscriptionsQueries.subscribeTag(sql, user, tag)) {
-                return new ProtocolReply("Subscribed", Optional.empty());
-            }
-        } else {
-            if (SubscriptionsQueries.unSubscribeTag(sql, user, tag)) {
-                return new ProtocolReply("Unsubscribed from " + tag.getName(), Optional.empty());
-            }
-            return new ProtocolReply("You was not subscribed to " + tag.getName(), Optional.empty());
-        }
-        return new ProtocolReply("Error", Optional.empty());
-    }
-
-    @UserCommand(pattern = "^\\s*help\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
-            help = "HELP - returns this help message")
-    public ProtocolReply commandHelp(User user, String[] input) {
-        List<String> commandsHelp = Arrays.stream(getClass().getDeclaredMethods())
-                .filter(m -> m.isAnnotationPresent(UserCommand.class))
-                .map(m -> m.getAnnotation(UserCommand.class).help())
-                .collect(Collectors.toList());
-        return new ProtocolReply(String.join("\n", commandsHelp), Optional.empty());
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/protocol/ProtocolReply.java b/server-core/src/main/java/com/juick/server/protocol/ProtocolReply.java
deleted file mode 100644
index d9d36a5d..00000000
--- a/server-core/src/main/java/com/juick/server/protocol/ProtocolReply.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.juick.server.protocol;
-
-import java.util.Optional;
-
-/**
- * Created by vitalyster on 08.04.2016.
- */
-public class ProtocolReply {
-
-    private Optional<String> json;
-    private String description;
-
-    public ProtocolReply(String text, Optional<String> json) {
-        this.description = text;
-        this.json = json;
-    }
-    public String getDescription() {
-        return description;
-    }
-    public Optional<String> getJson() {
-        return json;
-    }
-}
diff --git a/server-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java b/server-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
deleted file mode 100644
index af7c4924..00000000
--- a/server-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.juick.server.protocol.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Created by oxpa on 22.03.16.
- */
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface UserCommand {
-    /**
-     *
-     * @return a command pattern
-     */
-    String pattern() default "";
-
-    /**
-     *
-     * @return pattern flags
-     */
-    int patternFlags() default 0;
-
-    /**
-     *
-     * @return a string used in HELP command output. Basically, only 1 string
-     */
-    String help() default "";
-}
diff --git a/server-core/src/main/java/com/juick/service/AdsService.java b/server-core/src/main/java/com/juick/service/AdsService.java
deleted file mode 100644
index f8a0f5cf..00000000
--- a/server-core/src/main/java/com/juick/service/AdsService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.juick.service;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public interface AdsService {
-
-    int getAdMid(int uid);
-
-    int logAdMid(int uid, int mid);
-}
diff --git a/server-core/src/main/java/com/juick/service/AdsServiceImpl.java b/server-core/src/main/java/com/juick/service/AdsServiceImpl.java
deleted file mode 100644
index a6a5c85d..00000000
--- a/server-core/src/main/java/com/juick/service/AdsServiceImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.juick.service;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.inject.Inject;
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-@Repository
-@Transactional
-public class AdsServiceImpl extends BaseJdbcService implements AdsService {
-
-    @Inject
-    public AdsServiceImpl(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate, null);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int getAdMid(final int uid) {
-        List<Integer> list;
-
-        if (uid > 0)
-            list = getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM ads_messages " +
-                            "WHERE message_id NOT IN (SELECT message_id FROM ads_messages_log WHERE user_id = ? " +
-                            "AND ts > UNIX_TIMESTAMP() - 60*60*24 GROUP BY message_id HAVING COUNT(*) > 2) ORDER BY RAND() LIMIT 1",
-                    Integer.class,
-                    uid);
-
-        else
-            list = getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM ads_messages ORDER BY RAND() LIMIT 1",
-                    Integer.class);
-
-        return list.isEmpty() ?
-                0 : list.get(0);
-    }
-
-    @Override
-    public int logAdMid(final int uid, final int mid) {
-        return getJdbcTemplate().update(
-                "INSERT INTO ads_messages_log(user_id, message_id, ts) VALUES (?, ?, UNIX_TIMESTAMP())",
-                uid, mid);
-    }
-}
diff --git a/server-core/src/main/java/com/juick/service/BaseJdbcService.java b/server-core/src/main/java/com/juick/service/BaseJdbcService.java
deleted file mode 100644
index fe544efe..00000000
--- a/server-core/src/main/java/com/juick/service/BaseJdbcService.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.juick.service;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.support.TransactionTemplate;
-import org.springframework.util.Assert;
-
-import javax.sql.DataSource;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public abstract class BaseJdbcService {
-    protected final Logger logger = LoggerFactory.getLogger(getClass());
-
-    private final JdbcTemplate jdbcTemplate;
-    private final TransactionTemplate transactionTemplate;
-    private final NamedParameterJdbcTemplate namedParameterJdbcTemplate;
-
-
-    protected BaseJdbcService(JdbcTemplate jdbcTemplate, PlatformTransactionManager transactionManager) {
-        Assert.notNull(jdbcTemplate);
-
-        this.jdbcTemplate = jdbcTemplate;
-        this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
-        this.transactionTemplate = (transactionManager == null) ?
-                null : new TransactionTemplate(transactionManager);
-
-    }
-
-    protected BaseJdbcService(DataSource dataSource, PlatformTransactionManager transactionManager) {
-        Assert.notNull(dataSource);
-
-        this.jdbcTemplate = new JdbcTemplate(dataSource);
-        this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate);
-        this.transactionTemplate = (transactionManager == null) ?
-                null : new TransactionTemplate(transactionManager);
-
-    }
-
-    protected JdbcTemplate getJdbcTemplate() {
-        return jdbcTemplate;
-    }
-
-    protected NamedParameterJdbcTemplate getNamedParameterJdbcTemplate() {
-        return namedParameterJdbcTemplate;
-    }
-
-    protected TransactionTemplate getTransactionTemplate() {
-        return transactionTemplate;
-    }
-}
diff --git a/server-core/src/main/java/com/juick/service/CrosspostService.java b/server-core/src/main/java/com/juick/service/CrosspostService.java
deleted file mode 100644
index 88821b60..00000000
--- a/server-core/src/main/java/com/juick/service/CrosspostService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.juick.service;
-
-import com.juick.server.helpers.ApplicationStatus;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.Optional;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public interface CrosspostService {
-
-    Optional<Pair<String, String>> getTwitterTokens(int uid);
-
-    Optional<String> getFacebookToken(int uid);
-
-    ApplicationStatus getFbCrossPostStatus(int uid);
-
-    String getTwitterName(int uid);
-
-    String getTelegramName(int uid);
-
-    Optional<Pair<String, String>> getVkTokens(int uid);
-}
diff --git a/server-core/src/main/java/com/juick/service/CrosspostServiceImpl.java b/server-core/src/main/java/com/juick/service/CrosspostServiceImpl.java
deleted file mode 100644
index ed1cd676..00000000
--- a/server-core/src/main/java/com/juick/service/CrosspostServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.juick.service;
-
-import com.juick.server.helpers.ApplicationStatus;
-import org.apache.commons.lang3.tuple.Pair;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.inject.Inject;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-@Repository
-@Transactional(readOnly = true)
-public class CrosspostServiceImpl extends BaseJdbcService implements CrosspostService {
-
-    @Inject
-    public CrosspostServiceImpl(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate, null);
-    }
-
-    @Override
-    public Optional<Pair<String, String>> getTwitterTokens(final int uid) {
-        List<Optional<Pair<String, String>>> list = getJdbcTemplate().query(
-                "SELECT access_token,access_token_secret FROM twitter WHERE user_id = ? AND crosspost = 1",
-                (rs, num) -> Optional.of(Pair.of(rs.getString(1), rs.getString(2))),
-                uid);
-
-        return list.isEmpty() ?
-                Optional.empty() : list.get(0);
-    }
-
-    @Override
-    public Optional<String> getFacebookToken(final int uid) {
-        List<String> list = getJdbcTemplate().queryForList(
-                "SELECT access_token FROM facebook WHERE user_id = ? AND access_token IS NOT NULL AND crosspost = 1",
-                String.class,
-                uid);
-        return list.isEmpty() ?
-                Optional.empty() : Optional.of(list.get(0));
-    }
-
-    @Override
-    public ApplicationStatus getFbCrossPostStatus(final int uid) {
-        List<ApplicationStatus> list = getJdbcTemplate().query(
-                "SELECT 1, crosspost FROM facebook WHERE user_id = ? LIMIT 1",
-                (rs, num) -> {
-                    ApplicationStatus status = new ApplicationStatus();
-
-                    status.setConnected(rs.getInt(1) > 0);
-                    status.setCrosspostEnabled(rs.getBoolean(2));
-
-                    return status;
-                },
-                uid);
-
-        return list.isEmpty() ?
-                new ApplicationStatus() : list.get(0);
-    }
-
-    @Override
-    public String getTwitterName(final int uid) {
-        List<String> list = getJdbcTemplate().queryForList(
-                "SELECT uname FROM twitter WHERE user_id = ?",
-                String.class,
-                uid);
-
-        return list.isEmpty() ?
-                "" : list.get(0);
-    }
-
-    @Override
-    public String getTelegramName(final int uid) {
-        List<String> list = getJdbcTemplate().queryForList(
-                "SELECT tg_name FROM telegram WHERE user_id = ?",
-                String.class,
-                uid);
-
-        return list.isEmpty() ?
-                "" : list.get(0);
-    }
-
-    @Override
-    public Optional<Pair<String, String>> getVkTokens(final int uid) {
-        List<Optional<Pair<String, String>>> list = getJdbcTemplate().query(
-                "SELECT vk_id, access_token FROM vk WHERE user_id = ? AND crosspost = 1",
-                (rs, num) -> Optional.of(Pair.of(rs.getString(1), rs.getString(2))),
-                uid);
-
-        return list.isEmpty() ?
-                Optional.empty() : list.get(0);
-    }
-}
diff --git a/server-core/src/main/java/com/juick/service/MessagesService.java b/server-core/src/main/java/com/juick/service/MessagesService.java
deleted file mode 100644
index 00f97b75..00000000
--- a/server-core/src/main/java/com/juick/service/MessagesService.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.juick.service;
-
-import com.juick.User;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public interface MessagesService {
-    int createMessage(int uid, String txt, String attachment, List<com.juick.Tag> tags);
-
-    int createReply(int mid, int rid, int uid, String txt, String attachment);
-
-    int getReplyIDIncrement(int mid);
-
-    boolean recommendMessage(int mid, int vuid);
-
-    boolean canViewThread(int mid, int uid);
-
-    boolean isReadOnly(int mid);
-
-    boolean isSubscribed(int uid, int mid);
-
-    int getMessagePrivacy(int mid);
-
-    com.juick.Message getMessage(int mid);
-
-    com.juick.Message getReply(int mid, int rid);
-
-    User getMessageAuthor(int mid);
-
-    List<com.juick.Tag> getMessageTags(int mid);
-
-    List<Integer> getMessageTagsIDs(int mid);
-
-    List<String> getMessageRecommendations(int mid);
-
-    List<Integer> getAll(int visitor_uid, int before);
-
-    List<Integer> getTag(int tid, int visitor_uid, int before, int cnt);
-
-    List<Integer> getTags(String tids, int visitor_uid, int before, int cnt);
-
-    List<Integer> getPlace(int place_id, int visitor_uid, int before);
-
-    List<Integer> getMyFeed(int uid, int before);
-
-    List<Integer> getPrivate(int uid, int before);
-
-    List<Integer> getDiscussions(int uid, int before);
-
-    List<Integer> getRecommended(int uid, int before);
-
-    List<Integer> getPopular(int visitor_uid, int before);
-
-    List<Integer> getPhotos(int visitor_uid, int before);
-
-    List<Integer> getSearch(JdbcTemplate sqlSearch, String search, int before);
-
-    List<Integer> getUserBlog(int UID, int privacy, int before);
-
-    List<Integer> getUserTag(int UID, int TID, int privacy, int before);
-
-    List<Integer> getUserRecommendations(int UID, int before);
-
-    List<Integer> getUserPhotos(int UID, int privacy, int before);
-
-    List<Integer> getUserSearch(JdbcTemplate sqlSearch, int UID, String search, int privacy, int before);
-
-    List<com.juick.Message> getMessages(List<Integer> mids);
-
-    List<com.juick.Message> getReplies(int mid);
-
-    boolean setMessagePopular(int mid, int popular);
-
-    boolean setMessagePrivacy(int mid);
-
-    boolean deleteMessage(int uid, int mid);
-}
diff --git a/server-core/src/main/java/com/juick/service/MessagesServiceImpl.java b/server-core/src/main/java/com/juick/service/MessagesServiceImpl.java
deleted file mode 100644
index bb030ed4..00000000
--- a/server-core/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ /dev/null
@@ -1,857 +0,0 @@
-package com.juick.service;
-
-import com.juick.Message;
-import com.juick.Tag;
-import com.juick.User;
-import com.juick.server.helpers.PrivacyOpts;
-import com.juick.util.MessageUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import javax.inject.Inject;
-import java.sql.*;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-@Repository
-public class MessagesServiceImpl extends BaseJdbcService implements MessagesService {
-    private final UserService userService;
-
-    @Inject
-    public MessagesServiceImpl(JdbcTemplate jdbcTemplate, UserService userService) {
-        super(jdbcTemplate, null);
-
-        Assert.notNull(userService);
-        this.userService = userService;
-    }
-
-    private class MessageMapper implements RowMapper<Message> {
-        @Override
-        public Message mapRow(ResultSet rs, int rowNum) throws SQLException {
-            Message msg = new Message();
-            msg.setMid(rs.getInt(1));
-            msg.setRid(rs.getInt(2));
-            msg.setReplyto(rs.getInt(3));
-            User user = new User();
-            user.setUid(rs.getInt(4));
-            user.setName(rs.getString(5));
-            user.setBanned(rs.getBoolean(6));
-            msg.setUser(user);
-            msg.TimeAgo = rs.getInt(7);
-            msg.setDate(rs.getTimestamp(8));
-            msg.ReadOnly = rs.getBoolean(9);
-            msg.setPrivacy(rs.getInt(10));
-            msg.FriendsOnly = msg.getPrivacy() < 0;
-            msg.Replies = rs.getInt(11);
-            msg.AttachmentType = rs.getString(12);
-            if (rs.getDouble(13) != 0) {
-                msg.Place = new com.juick.Place();
-                msg.Place.lat = rs.getDouble(14);
-                msg.Place.lon = rs.getDouble(15);
-            }
-            msg.Likes = rs.getInt(16);
-            msg.Hidden = rs.getBoolean(17);
-            // parse tags string
-            String tagsStr = rs.getString(18);
-            if (tagsStr != null) {
-                Arrays.stream(tagsStr.split(" ")).forEach(t -> msg.getTags().add(new Tag(t)));
-            }
-            msg.RepliesBy = rs.getString(19);
-            msg.setText(rs.getString(20));
-            msg.setReplyQuote(MessageUtils.formatQuote(rs.getString(21)));
-            return msg;
-        }
-    }
-
-    @Transactional
-    @Override
-    public int createMessage(final int uid, final String txt, final String attachment, final List<com.juick.Tag> tags) {
-        KeyHolder holder = new GeneratedKeyHolder();
-        getJdbcTemplate().update(con -> {
-            PreparedStatement stmt = con.prepareStatement(
-                    "INSERT INTO messages(user_id,attach) VALUES (?,?)",
-                    Statement.RETURN_GENERATED_KEYS);
-            stmt.setInt(1, uid);
-            if (attachment != null) {
-                stmt.setString(2, attachment);
-            } else {
-                stmt.setNull(2, Types.VARCHAR);
-            }
-            return stmt;
-        }, holder);
-
-        int mid = holder.getKey().intValue();
-
-        if (mid > 0) {
-            String tagsNames = "";
-            String tagsIDs = "";
-
-            for (int i = 0; i < tags.size(); i++) {
-                if (i > 0) {
-                    tagsNames += " ";
-                    tagsIDs += ",";
-                }
-                tagsNames += tags.get(i).getName();
-                tagsIDs += "(" + mid + "," + tags.get(i).TID + ")";
-            }
-            if (tags.size() > 0) {
-                getJdbcTemplate().execute(
-                        "INSERT INTO messages_tags(message_id,tag_id) VALUES " + tagsIDs);
-            }
-            final String finalTagsNames = tagsNames;
-            getJdbcTemplate().update(con -> {
-                PreparedStatement stmt = con.prepareStatement(
-                        "INSERT INTO messages_txt(message_id,tags,txt) " +
-                                "VALUES (?,?,?)", Statement.NO_GENERATED_KEYS);
-                stmt.setInt(1, mid);
-                if (finalTagsNames.isEmpty()) {
-                    stmt.setNull(2, Types.VARCHAR);
-                } else {
-                    stmt.setString(2, finalTagsNames);
-                }
-                stmt.setString(3, txt);
-                return stmt;
-            });
-        }
-
-        return mid;
-    }
-
-    @Transactional
-    @Override
-    public int createReply(final int mid, final int rid, final int uid, final String txt, final String attachment) {
-        int ridnew = getReplyIDIncrement(mid);
-
-        getJdbcTemplate().update(con -> {
-            PreparedStatement stmt = con.prepareStatement(
-                    "INSERT INTO replies(message_id,reply_id,user_id,replyto,attach,txt) VALUES (?,?,?,?,?,?)",
-                    Statement.NO_GENERATED_KEYS);
-            stmt.setInt(1, mid);
-            stmt.setInt(2, ridnew);
-            stmt.setInt(3, uid);
-            stmt.setInt(4, rid);
-            if (attachment != null) {
-                stmt.setString(5, attachment);
-            } else {
-                stmt.setNull(5, Types.VARCHAR);
-            }
-            stmt.setString(6, txt);
-            return stmt;
-        });
-
-        if (ridnew > 0)
-            getJdbcTemplate().update(
-                    "UPDATE messages SET replies=replies+1 WHERE message_id=?",
-                    mid);
-
-        return ridnew;
-    }
-
-    @Override
-    public int getReplyIDIncrement(final int mid) {
-        return getJdbcTemplate().execute((ConnectionCallback<Integer>) conn -> {
-            conn.setAutoCommit(false);
-            final int replyNo;
-            try (PreparedStatement ps = conn.prepareStatement("START TRANSACTION")) {
-                ps.executeUpdate();
-            }
-            try (PreparedStatement ps = conn.prepareStatement("SELECT maxreplyid+1 FROM messages WHERE message_id=? FOR UPDATE")) {
-                ps.setInt(1, mid);
-                try (ResultSet resultSet = ps.executeQuery()) {
-                    if (resultSet.next()) {
-                        replyNo = resultSet.getInt(1);
-                    } else {
-                        throw new IncorrectResultSizeDataAccessException("while getting getReplyIDIncrement, mid=" + mid, 1, 0);
-                    }
-                }
-            }
-            try (PreparedStatement ps = conn.prepareStatement("UPDATE messages SET maxreplyid=? WHERE message_id=?")) {
-                ps.setInt(1, replyNo);
-                ps.setInt(2, mid);
-                if (ps.executeUpdate() != 1) {
-                    throw new IncorrectResultSizeDataAccessException("Cannot find a message to update: " + mid, 1, 0);
-                }
-            }
-            conn.commit();
-            return replyNo;
-        });
-
-    }
-
-    @Transactional
-    @Override
-    public boolean recommendMessage(final int mid, final int vuid) {
-        boolean res = getJdbcTemplate().update(
-                "INSERT IGNORE INTO favorites(user_id,message_id) VALUES (" + vuid + "," + mid + ")") == 1;
-        if (res) {
-            getJdbcTemplate().update(
-                    "UPDATE messages SET likes=likes+1 WHERE message_id=?",
-                    mid);
-        }
-        return res;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public boolean canViewThread(final int mid, final int uid) {
-        PrivacyOpts privacyOpts;
-        try {
-            privacyOpts = getJdbcTemplate().queryForObject(
-                    "SELECT user_id,privacy FROM messages WHERE messages.message_id=?",
-                    (rs, rowNum) -> {
-                        PrivacyOpts res = new PrivacyOpts();
-                        res.setUid(rs.getInt(1));
-                        res.setPrivacy(rs.getInt(2));
-                        return res;
-                    }, mid);
-        } catch (EmptyResultDataAccessException e) {
-            return true;
-        }
-        return privacyOpts.getPrivacy() >= 0
-                || uid == privacyOpts.getUid()
-                || ((privacyOpts.getPrivacy() == -1 || privacyOpts.getPrivacy() == -2) && uid > 0
-                && userService.isInWL(privacyOpts.getUid(), uid));
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public boolean isReadOnly(final int mid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT readonly FROM messages WHERE message_id=?",
-                    new Object[]{mid},
-                    Integer.class) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public boolean isSubscribed(final int uid, final int mid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT 1 FROM subscr_messages WHERE suser_id=? AND message_id=?",
-                    new Object[]{uid, mid},
-                    Integer.class) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int getMessagePrivacy(final int mid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT privacy FROM messages WHERE message_id=?",
-                    new Object[]{mid},
-                    Integer.class);
-        } catch (EmptyResultDataAccessException e) {
-            return -4;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public com.juick.Message getMessage(final int mid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT messages.message_id, 0 as rid, 0 as replyto, "
-                            + "messages.user_id,users.nick, 0 as banned, "
-                            + "TIMESTAMPDIFF(MINUTE,messages.ts,NOW()),"
-                            + "messages.ts,"
-                            + "messages.readonly,messages.privacy,messages.replies,"
-                            + "messages.attach,messages.place_id,messages.lat,"
-                            + "messages.lon,messages.likes,messages.hidden,"
-                            + "txt.tags,txt.repliesby,txt.txt, '' as q FROM messages "
-                            + "INNER JOIN users ON messages.user_id=users.id "
-                            + "INNER JOIN messages_txt AS txt "
-                            + "ON messages.message_id=txt.message_id "
-                            + "WHERE messages.message_id=?",
-                    new MessageMapper(),
-                    mid);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public com.juick.Message getReply(final int mid, final int rid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT replies.user_id,users.nick,"
-                            + "replies.replyto,replies.ts,"
-                            + "replies.attach,replies.txt, IFNULL(q.txt,t.txt) as quote FROM replies INNER JOIN users "
-                            + "ON replies.user_id=users.id "
-                            + "LEFT JOIN replies q "
-                            + "ON replies.message_id=q.message_id and replies.replyto=q.reply_id "
-                            + "LEFT JOIN messages_txt t ON replies.message_id=t.message_id "
-                            + "WHERE replies.message_id=? AND replies.reply_id=?",
-                    (rs, num) -> {
-                        Message msg = new Message();
-                        msg.setMid(mid);
-                        msg.setRid(rid);
-                        msg.setUser(new User());
-                        msg.getUser().setUid(rs.getInt(1));
-                        msg.getUser().setName(rs.getString(2));
-                        msg.setReplyto(rs.getInt(3));
-                        msg.setDate(rs.getTimestamp(4));
-                        msg.AttachmentType = rs.getString(5);
-                        msg.setText(rs.getString(6));
-                        String quote = rs.getString(7);
-                        if (!StringUtils.isEmpty(quote)) {
-                            msg.setReplyQuote(MessageUtils.formatQuote(quote));
-                        }
-                        return msg;
-                    }, mid, rid);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public User getMessageAuthor(final int mid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT messages.user_id,users.nick "
-                            + "FROM messages INNER JOIN users "
-                            + "ON messages.user_id=users.id WHERE messages.message_id=?",
-                    new Object[]{mid}, (rs, num) -> {
-                        User res = new com.juick.User();
-                        res.setUid(rs.getInt(1));
-                        res.setName(rs.getString(2));
-                        return res;
-                    });
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<com.juick.Tag> getMessageTags(final int mid) {
-        return getJdbcTemplate().query(
-                "SELECT tags.tag_id,synonym_id,name,stat_messages FROM tags " +
-                        "INNER JOIN messages_tags ON (messages_tags.message_id=? AND messages_tags.tag_id=tags.tag_id)",
-                new Object[]{mid}, (rs, num) -> {
-                    com.juick.Tag t = new com.juick.Tag(StringEscapeUtils.unescapeHtml4(rs.getString(3)));
-                    t.TID = rs.getInt(1);
-                    t.SynonymID = rs.getInt(2);
-                    t.UsageCnt = rs.getInt(4);
-                    return t;
-                });
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getMessageTagsIDs(final int mid) {
-        return getJdbcTemplate().queryForList(
-                "SELECT tag_id FROM messages_tags WHERE message_id=?",
-                new Object[]{mid},
-                Integer.class);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<String> getMessageRecommendations(final int mid) {
-        return getJdbcTemplate().queryForList(
-                "SELECT users.nick FROM favorites INNER JOIN users " +
-                        "ON (favorites.message_id=? AND favorites.user_id=users.id)",
-                new Object[]{mid},
-                String.class);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getAll(final int visitor_uid, final int before) {
-        if (visitor_uid > 1) {
-            if (before > 0) {
-                return getJdbcTemplate().queryForList(
-                        "SELECT message_id FROM messages WHERE message_id<? AND hidden=0" +
-                                " AND (privacy>0 OR user_id=?) AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?)" +
-                                " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
-                        new Object[]{before, visitor_uid, visitor_uid},
-                        Integer.class);
-            } else {
-                return getJdbcTemplate().queryForList(
-                        "SELECT message_id FROM messages WHERE hidden=0" +
-                                " AND (privacy>0 OR user_id=?)" +
-                                " AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?)" +
-                                " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
-                        new Object[]{visitor_uid, visitor_uid},
-                        Integer.class);
-            }
-        } else {
-            if (before > 0) {
-                return getJdbcTemplate().queryForList(
-                        "SELECT message_id FROM messages WHERE message_id<?" +
-                                " AND hidden=0 AND privacy>0 AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
-                                " ORDER BY message_id DESC LIMIT 20",
-                        new Object[]{before},
-                        Integer.class);
-            } else {
-                return getJdbcTemplate().queryForList(
-                        "SELECT message_id FROM messages WHERE hidden=0 AND privacy>0" +
-                                " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
-                        Integer.class);
-            }
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getTag(final int tid, final int visitor_uid, final int before, final int cnt) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM (tags INNER JOIN messages_tags " +
-                            "ON ((tags.synonym_id=? OR tags.tag_id=?) AND tags.tag_id=messages_tags.tag_id)) " +
-                            "INNER JOIN messages USING(message_id) WHERE messages.message_id<? " +
-                            "AND (messages.privacy>0 OR messages.user_id=?) ORDER BY message_id DESC LIMIT ?",
-                    new Object[]{tid, tid, before, visitor_uid, cnt},
-                    Integer.class);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM (tags INNER JOIN messages_tags " +
-                            "ON ((tags.synonym_id=? OR tags.tag_id=?) AND tags.tag_id=messages_tags.tag_id)) " +
-                            "INNER JOIN messages USING(message_id) WHERE messages.privacy>0 OR messages.user_id=? " +
-                            "ORDER BY message_id DESC LIMIT ?",
-                    new Object[]{tid, tid, visitor_uid, cnt},
-                    Integer.class);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getTags(final String tids, final int visitor_uid, final int before, final int cnt) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT messages.message_id FROM messages_tags " +
-                            "INNER JOIN messages USING(message_id) WHERE messages_tags.tag_id IN (" + tids + ") " +
-                            "AND messages.message_id<? AND (messages.privacy>0 OR messages.user_id=?) " +
-                            "ORDER BY messages.message_id DESC LIMIT ?",
-                    new Object[]{before, visitor_uid, cnt},
-                    Integer.class);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT messages.message_id FROM messages_tags " +
-                            "INNER JOIN messages USING(message_id) WHERE messages_tags.tag_id IN (" + tids + ") " +
-                            "AND (messages.privacy>0 OR messages.user_id=?) " +
-                            "ORDER BY messages.message_id DESC LIMIT ?",
-                    new Object[]{visitor_uid, cnt}, Integer.class);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getPlace(final int place_id, final int visitor_uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE place_id=? AND message_id<? " +
-                            "AND (privacy>0 OR user_id=?) ORDER BY message_id DESC LIMIT 20",
-                    new Object[]{place_id, before, visitor_uid},
-                    Integer.class);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE place_id=? AND (privacy>0 OR user_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    new Object[]{place_id, visitor_uid},
-                    Integer.class);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getMyFeed(final int uid, final int before) {
-        List<Integer> mids;
-        if (before > 0) {
-            mids = getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages " +
-                            "INNER JOIN subscr_users ON (subscr_users.suser_id=? AND subscr_users.user_id=messages.user_id) " +
-                            "WHERE message_id<? AND (privacy>=0 OR (privacy>=-2 AND privacy<=-1 AND messages.user_id " +
-                            "IN (SELECT user_id FROM wl_users WHERE wl_user_id=?))) ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid,
-                    before,
-                    uid);
-        } else {
-            mids = getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages " +
-                            "INNER JOIN subscr_users ON (subscr_users.suser_id=? " +
-                            "AND subscr_users.user_id=messages.user_id) " +
-                            "WHERE (privacy>=0 OR (privacy>=-2 AND privacy<=-1 AND messages.user_id " +
-                            "IN (SELECT user_id FROM wl_users WHERE wl_user_id=?))) ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid,
-                    uid);
-        }
-
-        if (before > 0) {
-            mids.addAll(getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages " +
-                            "WHERE user_id=? AND message_id<? ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid,
-                    before));
-        } else {
-            mids.addAll(getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages " +
-                            "WHERE user_id=? ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid));
-        }
-
-        Collections.sort(mids, Collections.reverseOrder());
-        int remove = mids.size() - 20;
-        for (int i = 0; i < remove; i++) {
-            mids.remove(20);
-        }
-
-        return mids;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getPrivate(final int uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList
-                    ("SELECT message_id FROM messages WHERE user_id=? AND privacy<0 AND message_id<? " +
-                                    "ORDER BY message_id DESC LIMIT 20",
-                            new Object[]{uid, before},
-                            Integer.class);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE user_id=? AND privacy<0 " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    new Object[]{uid},
-                    Integer.class);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getDiscussions(final int uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM subscr_messages WHERE suser_id=? AND message_id<? " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid,
-                    before);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM subscr_messages WHERE suser_id=? " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getRecommended(final int uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM favorites WHERE user_id " +
-                            "IN (SELECT user_id FROM subscr_users WHERE suser_id=?) AND message_id<? " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid,
-                    before);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM favorites WHERE user_id " +
-                            "IN (SELECT user_id FROM subscr_users WHERE suser_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    uid);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getPopular(final int visitor_uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE message_id<? AND privacy>0 " +
-                            "AND popular>0 AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    before,
-                    visitor_uid);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE privacy>0 " +
-                            "AND popular>0 AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    visitor_uid);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getPhotos(final int visitor_uid, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE message_id<? AND (privacy>0 OR user_id=?) " +
-                            "AND attach IS NOT NULL AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
-                            "AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    before,
-                    visitor_uid,
-                    visitor_uid);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE (privacy>0 OR user_id=?) " +
-                            "AND attach IS NOT NULL AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
-                            "AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                            "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    visitor_uid,
-                    visitor_uid);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getSearch(final JdbcTemplate sqlSearch, final String search, final int before) {
-        List<Integer> mids;
-
-        if (before > 0) {
-            mids = sqlSearch.queryForList(
-                    "SELECT id AS message_id FROM messages WHERE MATCH(?) AND id<? " +
-                            "ORDER BY id DESC LIMIT 25",
-                    Integer.class,
-                    search,
-                    before);
-        } else {
-            mids = sqlSearch.queryForList(
-                    "SELECT id AS message_id FROM messages WHERE MATCH(?) " +
-                            "ORDER BY id DESC LIMIT 25",
-                    Integer.class,
-                    search);
-        }
-        if (mids.size() > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE message_id " +
-                            "IN (" + StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") AND privacy>0 ORDER BY message_id DESC LIMIT 20",
-                    Integer.class);
-        }
-        return mids;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getUserBlog(final int UID, final int privacy, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE user_id=? AND message_id<? AND privacy>=" +
-                            privacy + " ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID,
-                    before);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE user_id=? AND privacy>=" + privacy +
-                            " ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getUserTag(final int UID, final int TID, final int privacy, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT messages.message_id FROM messages_tags INNER JOIN messages " +
-                            "USING(message_id) WHERE messages.user_id=? AND messages_tags.tag_id=? " +
-                            "AND messages.message_id<? AND messages.privacy>=" + privacy +
-                            " ORDER BY messages.message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID,
-                    TID,
-                    before);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT messages.message_id FROM messages_tags INNER JOIN messages " +
-                            "USING(message_id) WHERE messages.user_id=? AND messages_tags.tag_id=? " +
-                            "AND messages.privacy>=" + privacy + " ORDER BY messages.message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID,
-                    TID);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getUserRecommendations(final int UID, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM favorites "
-                            + "WHERE user_id=? AND message_id<? "
-                            + "ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID,
-                    before);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM favorites "
-                            + "WHERE user_id=? ORDER BY message_id DESC LIMIT 20",
-                    Integer.class,
-                    UID);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getUserPhotos(final int UID, final int privacy, final int before) {
-        if (before > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE user_id=? AND message_id<? AND privacy>=" +
-                            privacy + " AND attach IS NOT NULL ORDER BY message_id DESC LIMIT 20",
-                    new Object[]{UID, before},
-                    Integer.class);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE user_id=? AND privacy>=" + privacy +
-                            " AND attach IS NOT NULL ORDER BY message_id DESC LIMIT 20",
-                    new Object[]{UID},
-                    Integer.class);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getUserSearch(final JdbcTemplate sqlSearch, final int UID, final String search, final int privacy, final int before) {
-        List<Integer> mids;
-
-        if (before > 0) {
-            mids = sqlSearch.queryForList(
-                    "SELECT id AS message_id FROM messages WHERE user_id=? AND MATCH(?) AND id<? " +
-                            "ORDER BY id DESC LIMIT 20",
-                    new Object[]{UID, search, before},
-                    Integer.class);
-        } else {
-            mids = sqlSearch.queryForList(
-                    "SELECT id AS message_id FROM messages WHERE user_id=? AND MATCH(?) " +
-                            "ORDER BY id DESC LIMIT 20",
-                    new Object[]{UID, search},
-                    Integer.class);
-        }
-
-        if (mids.size() > 0) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT message_id FROM messages WHERE message_id IN (" +
-                            StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") AND privacy>=" + privacy + " ORDER BY message_id DESC",
-                    Integer.class);
-        }
-        return mids;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<com.juick.Message> getMessages(final List<Integer> mids) {
-        if (!mids.isEmpty()) {
-            return getJdbcTemplate().query(
-                    "SELECT messages.message_id, 0 as rid, 0 as replyto, "
-                            + "messages.user_id,users.nick, 0 as banned, "
-                            + "TIMESTAMPDIFF(MINUTE,messages.ts,NOW()),"
-                            + "messages.ts,"
-                            + "messages.readonly,messages.privacy,messages.replies,"
-                            + "messages.attach,messages.place_id,messages.lat,"
-                            + "messages.lon,messages.likes,messages.hidden,"
-                            + "messages_txt.tags,messages_txt.repliesby, messages_txt.txt, '' as q "
-                            + "FROM (messages INNER JOIN messages_txt "
-                            + "ON messages.message_id=messages_txt.message_id) "
-                            + "INNER JOIN users ON messages.user_id=users.id "
-                            + "WHERE messages.message_id "
-                            + "IN (" + StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") "
-                            + "ORDER BY messages.message_id DESC",
-                    new MessageMapper());
-        }
-        return Collections.emptyList();
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<com.juick.Message> getReplies(final int mid) {
-        return getJdbcTemplate().query(
-                "SELECT ? as mid, replies.reply_id,replies.replyto, " +
-                        "replies.user_id,users.nick,users.banned, " +
-                        "TIMESTAMPDIFF(MINUTE,replies.ts,NOW()),replies.ts," +
-                        "0 as readonly, 0 as privacy, 0 as replies," +
-                        "replies.attach, 0 as place_id, 0 as lat," +
-                        "0 as lon, 0 as likes, 0 as hidden," +
-                        "NULL as tags,NULL as repliesby, replies.txt, " +
-                        "IFNULL(qw.txt, t.txt) as q " +
-                        "FROM replies INNER JOIN users " +
-                        "ON replies.user_id=users.id " +
-                        "LEFT JOIN replies qw ON replies.message_id=qw.message_id and replies.replyto=qw.reply_id " +
-                        "LEFT JOIN messages_txt t on replies.message_id=t.message_id " +
-                        "WHERE replies.message_id=? " +
-                        "ORDER BY replies.reply_id ASC",
-                new MessageMapper(),
-                mid,
-                mid);
-    }
-
-    @Transactional
-    @Override
-    public boolean setMessagePopular(final int mid, final int popular) {
-        boolean ret;
-        switch (popular) {
-            case -2:
-                ret = getJdbcTemplate().update("UPDATE messages SET hidden=1 WHERE message_id=?", mid) > 0;
-                break;
-            case -1:
-                ret = getJdbcTemplate().update("UPDATE messages SET popular=0 WHERE message_id=?", mid) > 0;
-                break;
-            default:
-                ret = getJdbcTemplate().update("UPDATE messages SET popular=? WHERE message_id=?", popular, mid) > 0;
-                break;
-        }
-        if (popular == -1) {
-            ret = getJdbcTemplate().update("INSERT INTO top_ignore_messages VALUES (?)", mid) > 0;
-        }
-        return ret;
-    }
-
-    @Transactional
-    @Override
-    public boolean setMessagePrivacy(final int mid) {
-        return getJdbcTemplate().update("UPDATE messages SET privacy=1 WHERE message_id=?",
-                mid) > 0;
-    }
-
-    @Transactional
-    @Override
-    public boolean deleteMessage(final int uid, final int mid) {
-        if (getJdbcTemplate().update("DELETE FROM messages WHERE message_id=? AND user_id=?", mid, uid) > 0) {
-            getJdbcTemplate().update("DELETE FROM messages_txt WHERE message_id=?", mid);
-            getJdbcTemplate().update("DELETE FROM replies WHERE message_id=?", mid);
-            getJdbcTemplate().update("DELETE FROM subscr_messages WHERE message_id=?", mid);
-            getJdbcTemplate().update("DELETE FROM messages_tags WHERE message_id=?", mid);
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/server-core/src/main/java/com/juick/service/PMQueriesService.java b/server-core/src/main/java/com/juick/service/PMQueriesService.java
deleted file mode 100644
index df332870..00000000
--- a/server-core/src/main/java/com/juick/service/PMQueriesService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.juick.service;
-
-import com.juick.User;
-
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public interface PMQueriesService {
-    boolean createPM(int uid_from, int uid_to, String body);
-
-    boolean addPMinRoster(int uid, String jid);
-
-    boolean removePMinRoster(int uid, String jid);
-
-    boolean havePMinRoster(int uid, String jid);
-
-    String getLastView(int uid_from, int uid_to);
-
-    List<User> getPMLastConversationsUsers(int uid, int cnt);
-
-    List<com.juick.Message> getPMMessages(int uid, int uid_to);
-
-    List<com.juick.Message> getLastPMInbox(int uid);
-
-    List<com.juick.Message> getLastPMSent(int uid);
-}
diff --git a/server-core/src/main/java/com/juick/service/PMQueriesServiceImpl.java b/server-core/src/main/java/com/juick/service/PMQueriesServiceImpl.java
deleted file mode 100644
index 5c28c2ba..00000000
--- a/server-core/src/main/java/com/juick/service/PMQueriesServiceImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.juick.service;
-
-import com.juick.User;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.inject.Inject;
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-@Repository
-public class PMQueriesServiceImpl extends BaseJdbcService implements PMQueriesService {
-
-    @Inject
-    public PMQueriesServiceImpl(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate, null);
-    }
-
-    @Transactional
-    @Override
-    public boolean createPM(final int uid_from, final int uid_to, final String body) {
-        boolean ret = getJdbcTemplate().update(
-                "INSERT INTO pm(user_id,user_id_to,txt) VALUES (?,?,?)",
-                uid_from, uid_to, body) > 0;
-
-        if (ret) {
-            getJdbcTemplate().update(
-                    "INSERT INTO pm_streams(user_id,user_id_to,lastmessage,unread) "
-                            + "VALUES (?,?,NOW(),1) "
-                            + "ON DUPLICATE KEY UPDATE lastmessage=NOW(),unread=unread+1",
-                    uid_from, uid_to);
-        }
-        return ret;
-    }
-
-    @Transactional
-    @Override
-    public boolean addPMinRoster(final int uid, final String jid) {
-        return getJdbcTemplate().update(
-                "INSERT INTO pm_inroster(user_id,jid) VALUES (?,?)",
-                uid, jid) > 0;
-    }
-
-    @Transactional
-    @Override
-    public boolean removePMinRoster(final int uid, final String jid) {
-        return getJdbcTemplate().update(
-                "DELETE FROM pm_inroster WHERE user_id=? AND jid=?", uid, jid) > 0;
-    }
-
-    @Transactional
-    @Override
-    public boolean havePMinRoster(final int uid, final String jid) {
-        List<Integer> res = getJdbcTemplate().queryForList(
-                "SELECT 1 FROM pm_inroster WHERE user_id=? AND jid=?",
-                Integer.class,
-                uid,
-                jid);
-        return res.size() > 0;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public String getLastView(final int uid_from, final int uid_to) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT lastview FROM pm_streams WHERE user_id=? AND user_id_to=?",
-                    String.class,
-                    uid_from,
-                    uid_to);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<User> getPMLastConversationsUsers(final int uid, final int cnt) {
-        return getJdbcTemplate().query(
-                "SELECT pm_streams.user_id, users.nick, pm_streams.unread FROM pm_streams "
-                        + "INNER JOIN users ON users.id = pm_streams.user_id "
-                        + "WHERE pm_streams.user_id_to=? "
-                        + "ORDER BY pm_streams.unread DESC, pm_streams.lastmessage DESC LIMIT " + cnt,
-                (rs, rowNum) -> {
-                    com.juick.User u = new com.juick.User();
-                    u.setUid(rs.getInt(1));
-                    u.setName(rs.getString(2));
-                    u.setUnreadCount(rs.getInt(3));
-                    return u;
-                },
-                uid);
-    }
-
-    @Transactional
-    @Override
-    public List<com.juick.Message> getPMMessages(final int uid, final int uid_to) {
-        List<com.juick.Message> msgs = getJdbcTemplate().query(
-                "SELECT user_id,txt,ts FROM pm "
-                        + "WHERE (user_id=? AND user_id_to=?) "
-                        + "OR (user_id_to=? AND user_id=?) ORDER BY ts DESC LIMIT 20",
-                (rs, rowNum) -> {
-                    com.juick.Message msg = new com.juick.Message();
-                    int uuid = rs.getInt(1);
-                    msg.setUser(new User());
-                    msg.getUser().setUid(uuid);
-                    msg.setText(rs.getString(2));
-                    msg.setDate(rs.getTimestamp(3));
-                    return msg;
-                },
-                uid,
-                uid_to,
-                uid,
-                uid_to);
-
-        getJdbcTemplate().update(
-                "UPDATE pm_streams SET lastview=NOW(),unread=0 WHERE user_id_to=? AND user_id=?",
-                uid,
-                uid_to);
-
-        return msgs;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<com.juick.Message> getLastPMInbox(final int uid) {
-        return getJdbcTemplate().query(
-                "SELECT pm.user_id,users.nick,pm.txt,TIMESTAMPDIFF(MINUTE,pm.ts,NOW()),pm.ts " +
-                        "FROM pm INNER JOIN users ON pm.user_id=users.id WHERE pm.user_id_to=? ORDER BY pm.ts DESC LIMIT 20",
-                (rs, num) -> {
-                    com.juick.Message msg = new com.juick.Message();
-                    msg.setUser(new User());
-                    msg.getUser().setUid(rs.getInt(1));
-                    msg.getUser().setName(rs.getString(2));
-                    msg.setText(rs.getString(3));
-                    msg.TimeAgo = rs.getInt(4);
-                    msg.setDate(rs.getTimestamp(5));
-                    return msg;
-                },
-                uid);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<com.juick.Message> getLastPMSent(final int uid) {
-        return getJdbcTemplate().query(
-                "SELECT pm.user_id_to,users.nick,pm.txt,TIMESTAMPDIFF(MINUTE,pm.ts,NOW())," +
-                        "pm.ts FROM pm INNER JOIN users ON pm.user_id_to=users.id " +
-                        "WHERE pm.user_id=? ORDER BY pm.ts DESC LIMIT 20",
-                (rs, num) -> {
-                    com.juick.Message msg = new com.juick.Message();
-                    msg.setUser(new User());
-                    msg.getUser().setUid(rs.getInt(1));
-                    msg.getUser().setName(rs.getString(2));
-                    msg.setText(rs.getString(3));
-                    msg.TimeAgo = rs.getInt(4);
-                    msg.setDate(rs.getTimestamp(5));
-                    return msg;
-                },
-                uid);
-    }
-}
diff --git a/server-core/src/main/java/com/juick/service/PrivacyQueriesService.java b/server-core/src/main/java/com/juick/service/PrivacyQueriesService.java
deleted file mode 100644
index 61eb199b..00000000
--- a/server-core/src/main/java/com/juick/service/PrivacyQueriesService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.juick.service;
-
-import com.juick.Tag;
-import com.juick.User;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public interface PrivacyQueriesService {
-    enum PrivacyResult {
-        Removed, Added
-    }
-
-    PrivacyResult blacklistUser(User user, User target);
-
-    PrivacyResult blacklistTag(User user, Tag tag);
-}
diff --git a/server-core/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java b/server-core/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java
deleted file mode 100644
index 7dac4073..00000000
--- a/server-core/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.juick.service;
-
-import com.juick.Tag;
-import com.juick.User;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.inject.Inject;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-@Repository
-@Transactional
-public class PrivacyQueriesServiceImpl extends BaseJdbcService implements PrivacyQueriesService {
-
-    @Inject
-    public PrivacyQueriesServiceImpl(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate, null);
-    }
-
-    @Override
-    public PrivacyResult blacklistUser(final User user, final User target) {
-        int result = getJdbcTemplate().update(
-                "DELETE FROM bl_users WHERE user_id=? AND bl_user_id=?",
-                user.getUid(),
-                target.getUid());
-        if (result > 0) {
-            return PrivacyResult.Removed;
-        } else {
-            getJdbcTemplate().update(
-                    "INSERT INTO bl_users(user_id,bl_user_id) VALUES (?,?)",
-                    user.getUid(),
-                    target.getUid());
-            return PrivacyResult.Added;
-        }
-    }
-
-    @Override
-    public PrivacyResult blacklistTag(final User user, final Tag tag) {
-        int result = getJdbcTemplate().update(
-                "DELETE FROM bl_tags WHERE user_id=? AND tag_id=?",
-                user.getUid(),
-                tag.TID);
-        if (result > 0) {
-            return PrivacyResult.Removed;
-        } else {
-            getJdbcTemplate().update(
-                    "INSERT INTO bl_tags(user_id,tag_id) VALUES (?,?)",
-                    user.getUid(),
-                    tag.TID);
-            return PrivacyResult.Added;
-        }
-    }
-}
diff --git a/server-core/src/main/java/com/juick/service/PushQueriesService.java b/server-core/src/main/java/com/juick/service/PushQueriesService.java
deleted file mode 100644
index 8e7ce543..00000000
--- a/server-core/src/main/java/com/juick/service/PushQueriesService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.juick.service;
-
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public interface PushQueriesService {
-    List<String> getAndroidRegID(int uid);
-
-    List<String> getAndroidTokens(List<Integer> uids);
-
-    List<String> getWinPhoneURL(int uid);
-
-    List<String> getWindowsTokens(List<Integer> uids);
-
-    List<String> getAPNSToken(int uid);
-
-    List<String> getAPNSTokens(List<Integer> uids);
-}
diff --git a/server-core/src/main/java/com/juick/service/PushQueriesServiceImpl.java b/server-core/src/main/java/com/juick/service/PushQueriesServiceImpl.java
deleted file mode 100644
index 91861bd9..00000000
--- a/server-core/src/main/java/com/juick/service/PushQueriesServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.juick.service;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-
-import javax.inject.Inject;
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-@Repository
-@Transactional(readOnly = true)
-public class PushQueriesServiceImpl extends BaseJdbcService implements PushQueriesService {
-
-    @Inject
-    public PushQueriesServiceImpl(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate, null);
-    }
-
-    @Override
-    public List<String> getAndroidRegID(final int uid) {
-        return getJdbcTemplate().queryForList(
-                "SELECT regid FROM android WHERE user_id=?",
-                String.class,
-                uid);
-    }
-
-    @Override
-    public List<String> getAndroidTokens(final List<Integer> uids) {
-        return getJdbcTemplate().queryForList(
-                "SELECT regid FROM android INNER JOIN users " +
-                        "ON (users.id=android.user_id) WHERE users.id IN (" + StringUtils.collectionToCommaDelimitedString(uids) + ")",
-                String.class);
-    }
-
-    @Override
-    public List<String> getWinPhoneURL(final int uid) {
-        return getJdbcTemplate().queryForList(
-                "SELECT url FROM winphone WHERE user_id=?",
-                String.class,
-                uid);
-    }
-
-    @Override
-    public List<String> getWindowsTokens(final List<Integer> uids) {
-        return getJdbcTemplate().queryForList(
-                "SELECT url FROM winphone INNER JOIN users " +
-                        "ON (users.id=winphone.user_id) WHERE users.id IN (" + StringUtils.collectionToCommaDelimitedString(uids) + ")",
-                String.class);
-    }
-
-    @Override
-    public List<String> getAPNSToken(final int uid) {
-        return getJdbcTemplate().queryForList(
-                "SELECT token from ios WHERE user_id=?",
-                String.class,
-                uid);
-    }
-
-    @Override
-    public List<String> getAPNSTokens(final List<Integer> uids) {
-        return getJdbcTemplate().queryForList(
-                "SELECT token FROM ios INNER JOIN users " +
-                        "ON (users.id=ios.user_id) WHERE users.id IN (" + StringUtils.collectionToCommaDelimitedString(uids) + ")",
-                String.class);
-    }
-}
diff --git a/server-core/src/main/java/com/juick/service/ShowQueriesService.java b/server-core/src/main/java/com/juick/service/ShowQueriesService.java
deleted file mode 100644
index a7e1c364..00000000
--- a/server-core/src/main/java/com/juick/service/ShowQueriesService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.juick.service;
-
-import com.juick.User;
-
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public interface ShowQueriesService {
-    List<String> getRecommendedUsers(User forUser);
-
-    List<String> getTopUsers();
-}
diff --git a/server-core/src/main/java/com/juick/service/ShowQueriesServiceImpl.java b/server-core/src/main/java/com/juick/service/ShowQueriesServiceImpl.java
deleted file mode 100644
index 2ddfeb84..00000000
--- a/server-core/src/main/java/com/juick/service/ShowQueriesServiceImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.juick.service;
-
-import com.juick.User;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.inject.Inject;
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-@Repository
-@Transactional(readOnly = true)
-public class ShowQueriesServiceImpl extends BaseJdbcService implements ShowQueriesService {
-
-    @Inject
-    public ShowQueriesServiceImpl(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate, null);
-    }
-
-    @Override
-    public List<String> getRecommendedUsers(final User forUser) {
-        return getJdbcTemplate().queryForList(
-                "SELECT users.nick FROM subscr_users INNER JOIN users " +
-                        "ON subscr_users.user_id=users.id " +
-                        "WHERE subscr_users.user_id NOT IN (SELECT user_id FROM subscr_users WHERE suser_id=?) " +
-                        "AND subscr_users.suser_id IN (SELECT user_id FROM subscr_users WHERE suser_id=?) " +
-                        "AND subscr_users.user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
-                        "AND subscr_users.user_id!=? AND users.lastmessage>UNIX_TIMESTAMP()-259200 " +
-                        "GROUP BY subscr_users.user_id ORDER BY count(*) DESC LIMIT 10",
-                String.class,
-                forUser.getUid(),
-                forUser.getUid(),
-                forUser.getUid(),
-                forUser.getUid());
-    }
-
-    @Override
-    public List<String> getTopUsers() {
-        return getJdbcTemplate().queryForList(
-                "SELECT users.nick,COUNT(subscr_users.suser_id) AS cnt " +
-                        "FROM (subscr_users INNER JOIN users ON subscr_users.user_id=users.id) " +
-                        "INNER JOIN useroptions ON users.id=useroptions.user_id " +
-                        "WHERE useroptions.privacy_view>0 AND users.lastmessage > UNIX_TIMESTAMP() - 259200 " +
-                        "AND users.id!=2 GROUP BY subscr_users.user_id ORDER BY cnt DESC LIMIT 10",
-                String.class);
-    }
-}
diff --git a/server-core/src/main/java/com/juick/service/SubscriptionService.java b/server-core/src/main/java/com/juick/service/SubscriptionService.java
deleted file mode 100644
index 00aee15d..00000000
--- a/server-core/src/main/java/com/juick/service/SubscriptionService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.juick.service;
-
-import com.juick.Tag;
-import com.juick.User;
-import com.juick.server.helpers.NotifyOpts;
-
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public interface SubscriptionService {
-    List<String> getJIDSubscribedToUser(int uid, boolean friendsonly);
-
-    List<User> getSubscribedUsers(int uid, int mid);
-
-    List<User> getUsersSubscribedToComments(int mid, int ignore_uid);
-
-    List<User> getUsersSubscribedToUserRecommendations(int uid, int mid, int muid);
-
-    boolean subscribeMessage(int mid, int vuid);
-
-    boolean unSubscribeMessage(int mid, int vuid);
-
-    boolean subscribeUser(User user, User toUser);
-
-    boolean unSubscribeUser(User user, User fromUser);
-
-    boolean subscribeTag(User user, Tag toTag);
-
-    boolean unSubscribeTag(User user, Tag toTag);
-
-    NotifyOpts getNotifyOptions(User user);
-
-    boolean setNotifyOptions(User user, NotifyOpts options);
-}
diff --git a/server-core/src/main/java/com/juick/service/SubscriptionServiceImpl.java b/server-core/src/main/java/com/juick/service/SubscriptionServiceImpl.java
deleted file mode 100644
index f6ecb658..00000000
--- a/server-core/src/main/java/com/juick/service/SubscriptionServiceImpl.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.juick.service;
-
-import com.juick.Tag;
-import com.juick.User;
-import com.juick.server.helpers.NotifyOpts;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import javax.inject.Inject;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-@Repository
-public class SubscriptionServiceImpl extends BaseJdbcService implements SubscriptionService {
-    private final UserService userService;
-    private final MessagesService messagesService;
-
-    @Inject
-    public SubscriptionServiceImpl(JdbcTemplate jdbcTemplate, UserService userService, MessagesService messagesService) {
-        super(jdbcTemplate, null);
-
-        Assert.notNull(userService);
-        this.userService = userService;
-
-        Assert.notNull(messagesService);
-        this.messagesService = messagesService;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<String> getJIDSubscribedToUser(final int uid, final boolean friendsonly) {
-        if (friendsonly == false) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT jids.jid FROM subscr_users INNER JOIN jids " +
-                            "ON (subscr_users.user_id=? AND subscr_users.suser_id=jids.user_id) WHERE jids.active=1",
-                    String.class,
-                    uid);
-        } else {
-            return getJdbcTemplate().queryForList(
-                    "SELECT jids.jid FROM subscr_users INNER JOIN jids " +
-                            "ON (subscr_users.user_id=? AND subscr_users.suser_id=jids.user_id) WHERE jids.active=1 " +
-                            "AND jids.user_id IN (SELECT wl_user_id FROM wl_users WHERE user_id=?)",
-                    String.class,
-                    uid,
-                    uid);
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<User> getSubscribedUsers(final int uid, final int mid) {
-        User author = messagesService.getMessageAuthor(mid);
-
-        List<User> userids = userService.getUserReaders(uid);
-
-        Set<Integer> set = new HashSet<>();
-        set.addAll(userids.stream().map(User::getUid).collect(Collectors.toList()));
-        List<Integer> tags = messagesService.getMessageTagsIDs(mid);
-        if (tags.size() > 0) {
-            List<Integer> tagUsers = getJdbcTemplate().queryForList(
-                    "SELECT suser_id FROM subscr_tags " +
-                            "WHERE tag_id IN (" + StringUtils.arrayToCommaDelimitedString(tags.toArray()) + ") AND suser_id!=? " +
-                            " AND suser_id NOT IN (SELECT user_id FROM bl_users WHERE bl_user_id=?)",
-                    Integer.class,
-                    uid,
-                    author.getUid());
-            set.addAll(tagUsers);
-        }
-        return userService.getUsersByID(new ArrayList<>(set));
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<User> getUsersSubscribedToComments(final int mid, final int ignore_uid) {
-        List<Integer> userids = getJdbcTemplate().queryForList(
-                "SELECT suser_id FROM subscr_messages WHERE message_id=? AND suser_id!=?",
-                Integer.class,
-                mid,
-                ignore_uid);
-        if (userids.size() > 0) {
-            return userService.getUsersByID(userids);
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<User> getUsersSubscribedToUserRecommendations(final int uid, final int mid, final int muid) {
-        List<Integer> tags = messagesService.getMessageTagsIDs(mid);
-
-        String query = "SELECT suser_id FROM subscr_users WHERE user_id=" + uid;
-        query += " AND user_id NOT IN (SELECT user_id FROM bl_users WHERE bl_user_id=" + muid + ")";
-        query += " AND user_id NOT IN (SELECT suser_id FROM subscr_users WHERE user_id=" + muid + ")";
-        query += " AND user_id NOT IN (SELECT suser_id FROM subscr_messages WHERE message_id=" + mid + ")";
-        query += " AND user_id NOT IN (SELECT user_id FROM favorites WHERE message_id=" + mid + ")";
-        query += " AND user_id NOT IN (SELECT subscr_users.suser_id FROM subscr_users INNER JOIN favorites ON (favorites.message_id=" + mid + " AND subscr_users.user_id=favorites.user_id AND favorites.user_id!=" + uid + "))";
-
-        if (!tags.isEmpty()) {
-            String tagsStr = StringUtils.arrayToCommaDelimitedString(tags.toArray());
-            query += " AND user_id NOT IN (SELECT suser_id FROM subscr_tags WHERE tag_id IN (" + tagsStr + "))";
-            query += " AND user_id NOT IN (SELECT user_id FROM bl_tags WHERE tag_id IN (" + tagsStr + "))";
-        }
-
-        List<Integer> userids = getJdbcTemplate().queryForList(query, Integer.class);
-
-        return userService.getUsersByID(userids);
-    }
-
-    @Transactional
-    @Override
-    public boolean subscribeMessage(final int mid, final int vuid) {
-        return getJdbcTemplate().update(
-                "INSERT IGNORE INTO subscr_messages(suser_id,message_id) VALUES (" + vuid + "," + mid + ")") == 1;
-    }
-
-    @Transactional
-    @Override
-    public boolean unSubscribeMessage(final int mid, final int vuid) {
-        return getJdbcTemplate().update(
-                "DELETE FROM subscr_messages WHERE message_id=? AND suser_id=?",
-                mid, vuid) > 0;
-    }
-
-    @Transactional
-    @Override
-    public boolean subscribeUser(final User user, final User toUser) {
-        return getJdbcTemplate().update(
-                "INSERT IGNORE INTO subscr_users(user_id,suser_id) VALUES (?,?)",
-                toUser.getUid(), user.getUid()) == 1;
-    }
-
-    @Transactional
-    @Override
-    public boolean unSubscribeUser(final User user, final User fromUser) {
-        return getJdbcTemplate().update(
-                "DELETE FROM subscr_users WHERE suser_id=? AND user_id=?",
-                user.getUid(), fromUser.getUid()) > 0;
-    }
-
-    @Transactional
-    @Override
-    public boolean subscribeTag(final User user, final Tag toTag) {
-        return getJdbcTemplate().update(
-                "INSERT IGNORE INTO subscr_tags(tag_id,suser_id) VALUES (?,?)",
-                toTag.TID, user.getUid()) == 1;
-    }
-
-    @Transactional
-    @Override
-    public boolean unSubscribeTag(final User user, final Tag toTag) {
-        return getJdbcTemplate().update(
-                "DELETE FROM subscr_tags WHERE tag_id=? AND suser_id=?",
-                toTag.TID, user.getUid()) > 0;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public NotifyOpts getNotifyOptions(final User user) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT jnotify,subscr_notify,recommendations FROM useroptions WHERE user_id=?",
-                    (rs, num) -> {
-                        NotifyOpts options = new NotifyOpts();
-                        options.setRepliesEnabled(rs.getInt(1) > 0);
-                        options.setSubscriptionsEnabled(rs.getInt(2) > 0);
-                        options.setRecommendationsEnabled(rs.getInt(3) > 0);
-                        return options;
-                    },
-                    user.getUid());
-        } catch (EmptyResultDataAccessException e) {
-            return new NotifyOpts();
-        }
-    }
-
-    @Transactional
-    @Override
-    public boolean setNotifyOptions(final User user, final NotifyOpts options) {
-        return getJdbcTemplate().update(
-                "UPDATE useroptions SET jnotify=? WHERE user_id=?", options.isRepliesEnabled() ? 1 : 0,
-                user.getUid()) > 0 &&
-                getJdbcTemplate().update(
-                        "UPDATE useroptions SET subscr_notify=? WHERE user_id=?", options.isSubscriptionsEnabled() ? 1 : 0,
-                        user.getUid()) > 0 &&
-                getJdbcTemplate().update(
-                        "UPDATE useroptions SET recommendations=? WHERE user_id=?", options.isRecommendationsEnabled() ? 1 : 0,
-                        user.getUid()) > 0;
-    }
-}
diff --git a/server-core/src/main/java/com/juick/service/TagService.java b/server-core/src/main/java/com/juick/service/TagService.java
deleted file mode 100644
index d5f63e3a..00000000
--- a/server-core/src/main/java/com/juick/service/TagService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.juick.service;
-
-import com.juick.Tag;
-
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public interface TagService {
-    com.juick.Tag getTag(int tid);
-
-    com.juick.Tag getTag(String tag, boolean autoCreate);
-
-    List<Tag> getTags(String[] tags, boolean autoCreate);
-
-    boolean getTagNoIndex(int tag_id);
-
-    int createTag(String name);
-
-    List<com.juick.Tag> getUserTagsAll(int uid);
-
-    List<String> getUserBLTags(int uid);
-
-    List<String> getPopularTags();
-
-    List<Tag> updateTags(int mid, List<Tag> newTags);
-
-    List<Tag> fromString(String txt, boolean tagsOnly);
-}
diff --git a/server-core/src/main/java/com/juick/service/TagServiceImpl.java b/server-core/src/main/java/com/juick/service/TagServiceImpl.java
deleted file mode 100644
index d63159cf..00000000
--- a/server-core/src/main/java/com/juick/service/TagServiceImpl.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.juick.service;
-
-import com.juick.Tag;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-
-import javax.inject.Inject;
-import java.sql.PreparedStatement;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-@Repository
-public class TagServiceImpl extends BaseJdbcService implements TagService {
-    private static final Pattern TAGS_PATTERN1 = Pattern.compile("^(?:(?:\\*[^ \\r\\n\\t]+)|\\s)+$");
-    private static final Pattern TAGS_PATTERN2 = Pattern.compile("^\\*([^ \\r\\n\\t]+)\\s+([\\s\\S]+)");
-    private static final Pattern TAG_PATTERN = Pattern.compile("\\*([^ \\r\\n\\t]+)");
-
-    private final MessagesService messagesService;
-
-    @Inject
-    public TagServiceImpl(JdbcTemplate jdbcTemplate, MessagesService messagesService) {
-        super(jdbcTemplate, null);
-        Assert.notNull(messagesService);
-        this.messagesService = messagesService;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public com.juick.Tag getTag(final int tid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT synonym_id,name FROM tags WHERE tag_id=?",
-                    (rs, num) -> {
-                        Tag ret = new Tag(StringEscapeUtils.unescapeHtml4(rs.getString(2)));
-                        ret.TID = tid;
-                        ret.SynonymID = rs.getInt(1);
-                        return ret;
-                    },
-                    tid);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public com.juick.Tag getTag(final String tag, final boolean autoCreate) {
-        Tag ret = null;
-        try {
-            ret = getJdbcTemplate().queryForObject(
-                    "SELECT tag_id,synonym_id,name FROM tags WHERE name=?",
-                    (rs, rowNum) -> {
-                        Tag ret1 = new Tag(StringEscapeUtils.unescapeHtml4(rs.getString(3)));
-                        ret1.TID = rs.getInt(1);
-                        ret1.SynonymID = rs.getInt(2);
-                        return ret1;
-                    },
-                    StringEscapeUtils.escapeHtml4(tag));
-        } catch (EmptyResultDataAccessException e) {
-            // tag not found
-        }
-        if (ret == null && autoCreate) {
-            ret = new com.juick.Tag(tag);
-            ret.TID = createTag(tag);
-        }
-
-        return ret;
-    }
-
-    @Override
-    public List<Tag> getTags(final String[] tags, final boolean autoCreate) {
-        List<Tag> ret = new ArrayList<>();
-
-        for (String tag : tags) {
-            if (!tag.isEmpty()) {
-                Tag t = getTag(tag, autoCreate);
-                if (t != null) {
-                    ret.add(t);
-                }
-            }
-        }
-
-        return ret;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public boolean getTagNoIndex(final int tag_id) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT noindex FROM tags WHERE tag_id=?", Integer.class, tag_id) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    @Transactional
-    @Override
-    public int createTag(final String name) {
-        KeyHolder holder = new GeneratedKeyHolder();
-        getJdbcTemplate().update(con -> {
-            PreparedStatement stmt = con.prepareStatement(
-                    "INSERT INTO tags(name) VALUES (?)",
-                    Statement.RETURN_GENERATED_KEYS);
-            stmt.setString(1, StringEscapeUtils.escapeHtml4(name));
-            return stmt;
-        }, holder);
-
-        return holder.getKey().intValue();
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<com.juick.Tag> getUserTagsAll(final int uid) {
-        return getJdbcTemplate().query(
-                "SELECT tags.name,COUNT(messages.message_id) " +
-                        "FROM (messages INNER JOIN messages_tags ON (messages.user_id=? " +
-                        "AND messages.message_id=messages_tags.message_id)) " +
-                        "INNER JOIN tags ON messages_tags.tag_id=tags.tag_id GROUP BY tags.tag_id ORDER BY tags.name ASC",
-                (rs, rowNum) -> {
-                    Tag t = new Tag(StringEscapeUtils.unescapeHtml4(rs.getString(1)));
-                    t.UsageCnt = rs.getInt(2);
-                    return t;
-                }, uid);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<String> getUserBLTags(final int uid) {
-        return getJdbcTemplate().queryForList(
-                "SELECT tags.name FROM tags INNER JOIN bl_tags " +
-                        "ON (bl_tags.user_id=? AND bl_tags.tag_id=tags.tag_id) ORDER BY tags.name",
-                String.class, uid);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<String> getPopularTags() {
-        return getJdbcTemplate().queryForList(
-                "SELECT name FROM tags WHERE top=1 ORDER BY name ASC", String.class).stream()
-                .map(StringEscapeUtils::unescapeHtml4).collect(Collectors.toList());
-    }
-
-    @Transactional
-    @Override
-    public List<Tag> updateTags(final int mid, final List<Tag> newTags) {
-        List<Tag> currentTags = messagesService.getMessageTags(mid);
-        newTags.stream().filter(currentTags::contains)
-                .forEach(t -> getJdbcTemplate().update(
-                        "DELETE FROM messages_tags WHERE message_id=? AND tag_id=?",
-                        mid,
-                        t.TID));
-        newTags.stream().filter(t -> !currentTags.contains(t))
-                .forEach(t -> getJdbcTemplate().update(
-                        "INSERT INTO messages_tags(message_id,tag_id) VALUES (?,?)", mid, t.TID));
-        return messagesService.getMessageTags(mid);
-    }
-
-    @Override
-    public List<Tag> fromString(final String txt, final boolean tagsOnly) {
-        Pattern tagsPattern = tagsOnly ? TAGS_PATTERN1 : TAGS_PATTERN2;
-
-        if (tagsPattern.matcher(txt).matches()) {
-            Matcher tagMatcher = TAG_PATTERN.matcher(txt);
-            List<Tag> tags = new ArrayList<>();
-            // TODO: process readonly, private, friends, public
-            while (tagMatcher.find()) {
-                for (int i = 1; i <= tagMatcher.groupCount(); i++) {
-                    tags.add(getTag(tagMatcher.group(i), true));
-                }
-            }
-            return tags;
-        }
-        return Collections.emptyList();
-    }
-}
diff --git a/server-core/src/main/java/com/juick/service/UserService.java b/server-core/src/main/java/com/juick/service/UserService.java
deleted file mode 100644
index e970afb7..00000000
--- a/server-core/src/main/java/com/juick/service/UserService.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.juick.service;
-
-import com.juick.User;
-import com.juick.server.helpers.Auth;
-import com.juick.server.helpers.EmailOpts;
-import com.juick.server.helpers.UserInfo;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public interface UserService {
-    enum ActiveStatus {
-        Inactive,
-        Active
-    }
-
-    String getSignUpHashByJID(String jid);
-
-    String getSignUpHashByTelegramID(Long telegramId, String username);
-
-    int createUser(String username, String password);
-
-    Optional<User> getUserByUID(int uid);
-
-    User getUserByName(String username);
-
-    User getUserByJID(String jid);
-
-    List<User> getUsersByName(List<String> unames);
-
-    List<User> getUsersByID(List<Integer> uids);
-
-    List<com.juick.User> getUsersByJID(List<String> jids);
-
-    List<String> getJIDsbyUID(int uid);
-
-    int getUIDbyJID(String jid);
-
-    int getUIDbyName(String uname);
-
-    int getUIDbyHash(String hash);
-
-    com.juick.User getUserByHash(String hash);
-
-    String getHashByUID(int uid);
-
-    int checkPassword(String username, String password);
-
-    boolean updatePassword(User user, String newPassword);
-
-    String updateSecretEmail(User user);
-
-    int getUserOptionInt(int uid, String option, int defaultValue);
-
-    void setUserOptionInt(int uid, String option, int value);
-
-    UserInfo getUserInfo(User user);
-
-    boolean updateUserInfo(User user, UserInfo info);
-
-    boolean getCanMedia(int uid);
-
-    boolean isInWL(int uid, int check);
-
-    boolean isInBL(int uid, int check);
-
-    boolean isInBLAny(int uid, int uid2);
-
-    List<Integer> checkBL(int visitor, List<Integer> uids);
-
-    boolean isSubscribed(int uid, int check);
-
-    List<Integer> getUserRead(int uid);
-
-    List<com.juick.User> getUserReadLeastPopular(int uid, int cnt);
-
-    List<User> getUserReaders(int uid);
-
-    List<User> getUserFriends(int uid);
-
-    List<com.juick.User> getUserBLUsers(int uid);
-
-    boolean linkTwitterAccount(User user, String accessToken, String accessTokenSecret, String screenName);
-
-    int getStatsIRead(int uid);
-
-    int getStatsMyReaders(int uid);
-
-    int getStatsMessages(int uid);
-
-    int getStatsReplies(int uid);
-
-    boolean setActiveStatusForJID(String JID, ActiveStatus jidStatus);
-
-    List<String> getAllJIDs(User user);
-
-    List<Auth> getAuthCodes(User user);
-
-    List<String> getEmails(User user);
-
-    EmailOpts getEmailOpts(User user);
-
-    String getEmailHash(User user);
-}
diff --git a/server-core/src/main/java/com/juick/service/UserServiceImpl.java b/server-core/src/main/java/com/juick/service/UserServiceImpl.java
deleted file mode 100644
index 63785cff..00000000
--- a/server-core/src/main/java/com/juick/service/UserServiceImpl.java
+++ /dev/null
@@ -1,614 +0,0 @@
-package com.juick.service;
-
-import com.juick.User;
-import com.juick.server.helpers.Auth;
-import com.juick.server.helpers.EmailOpts;
-import com.juick.server.helpers.UserInfo;
-import com.juick.util.UserUtils;
-import org.springframework.dao.DuplicateKeyException;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-
-import javax.inject.Inject;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.*;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-@Repository
-public class UserServiceImpl extends BaseJdbcService implements UserService {
-
-    private class UserMapper implements RowMapper<User> {
-        @Override
-        public User mapRow(ResultSet rs, int rowNum) throws SQLException {
-            User user = new User();
-            user.setUid(rs.getInt(1));
-            user.setName(rs.getString(2));
-            user.setBanned(rs.getBoolean(3));
-            return user;
-        }
-    }
-
-    @Inject
-    public UserServiceImpl(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate, null);
-    }
-
-    @Transactional
-    @Override
-    public String getSignUpHashByJID(final String jid) {
-        String hash;
-        try {
-            hash = getJdbcTemplate().queryForObject(
-                    "SELECT loginhash FROM jids WHERE jid=? AND user_id IS NULL",
-                    String.class,
-                    jid);
-        } catch (EmptyResultDataAccessException e) {
-            hash = UUID.randomUUID().toString();
-            getJdbcTemplate().update("INSERT INTO jids(jid,loginhash) VALUES (?,?)", jid, hash);
-        }
-        return hash;
-    }
-
-    @Transactional
-    @Override
-    public String getSignUpHashByTelegramID(final Long telegramId, final String username) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT loginhash FROM telegram WHERE tg_id=? AND user_id IS NULL",
-                    String.class,
-                    telegramId);
-        } catch (EmptyResultDataAccessException e) {
-            String hash = UUID.randomUUID().toString();
-            getJdbcTemplate().update(
-                    "INSERT INTO telegram(tg_id, loginhash, tg_name) VALUES (?, ?, ?)", telegramId, hash, username);
-            return hash;
-        }
-    }
-
-    @Transactional
-    @Override
-    public int createUser(final String username, final String password) {
-        KeyHolder holder = new GeneratedKeyHolder();
-        try {
-            getJdbcTemplate().update(con -> {
-                PreparedStatement stmt = con.prepareStatement(
-                        "INSERT INTO users(nick,passw) VALUES (?,?)",
-                        Statement.RETURN_GENERATED_KEYS);
-                stmt.setString(1, username);
-                stmt.setString(2, password);
-                return stmt;
-            }, holder);
-        } catch (DuplicateKeyException e) {
-            return -1;
-        }
-
-        int uid = holder.getKey().intValue();
-
-        getJdbcTemplate().update("INSERT INTO useroptions(user_id) VALUES (?)", uid);
-        getJdbcTemplate().update("INSERT INTO subscr_users(user_id,suser_id) VALUES (2,?)", uid);
-
-        return uid;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public Optional<User> getUserByUID(final int uid) {
-        try {
-            return Optional.of(
-                    getJdbcTemplate().queryForObject("SELECT id, nick,banned FROM users WHERE id=?",
-                            new UserMapper(),
-                            uid));
-        } catch (EmptyResultDataAccessException e) {
-            return Optional.empty();
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public User getUserByName(final String username) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT id,nick,banned FROM users WHERE nick=?",
-                    new UserMapper(),
-                    username);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public User getUserByJID(final String jid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT id,nick,banned FROM users WHERE id=(SELECT user_id FROM jids WHERE jid=?)",
-                    new UserMapper(),
-                    jid);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<User> getUsersByName(final List<String> unames) {
-        if (!unames.isEmpty()) {
-            return getJdbcTemplate().query(
-                    "SELECT id,nick,banned FROM users WHERE nick IN (\"" + StringUtils.arrayToDelimitedString(unames.toArray(), "\",\"") + "\")",
-                    new UserMapper());
-        }
-        return Collections.emptyList();
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<User> getUsersByID(final List<Integer> uids) {
-        if (!uids.isEmpty()) {
-            return getJdbcTemplate().query(
-                    "SELECT id,nick,banned FROM users WHERE id IN (" + StringUtils.arrayToCommaDelimitedString(uids.toArray()) + ")",
-                    new UserMapper());
-        }
-        return Collections.emptyList();
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<com.juick.User> getUsersByJID(final List<String> jids) {
-        if (!jids.isEmpty()) {
-            return getJdbcTemplate().query(
-                    "SELECT users.id,users.nick,jids.jid FROM users "
-                            + "INNER JOIN jids ON jids.user_id=users.id "
-                            + "WHERE jids.jid IN (\"" + StringUtils.arrayToDelimitedString(jids.toArray(), "\",\"") + "\")",
-                    (rs, rowNum) -> {
-                        com.juick.User user = new com.juick.User();
-                        user.setUid(rs.getInt(1));
-                        user.setName(rs.getString(2));
-                        user.setJID(rs.getString(3));
-                        return user;
-                    });
-        }
-        return Collections.emptyList();
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<String> getJIDsbyUID(final int uid) {
-        return getJdbcTemplate().queryForList("SELECT jid FROM jids WHERE user_id=? AND active=1", String.class, uid);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int getUIDbyJID(final String jid) {
-        try {
-            return getJdbcTemplate().queryForObject("SELECT user_id FROM jids WHERE jid=?", Integer.class, jid);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int getUIDbyName(final String uname) {
-        try {
-            return getJdbcTemplate().queryForObject("SELECT id FROM users WHERE nick=?", Integer.class, uname);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int getUIDbyHash(final String hash) {
-        try {
-            return getJdbcTemplate().queryForObject("SELECT user_id FROM logins WHERE hash=?", Integer.class, hash);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public com.juick.User getUserByHash(final String hash) {
-        try {
-            User user = getJdbcTemplate().queryForObject(
-                    "SELECT logins.user_id,users.nick, users.banned FROM logins " +
-                            "INNER JOIN users ON logins.user_id=users.id WHERE logins.hash=?",
-                    new UserMapper(),
-                    hash);
-            user.setAuthHash(hash);
-            return user;
-        } catch (EmptyResultDataAccessException e) {
-            return new User();
-        }
-    }
-
-    @Transactional
-    @Override
-    public String getHashByUID(final int uid) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT hash FROM logins WHERE user_id=?", String.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            String hash = UserUtils.generateHash(16);
-            getJdbcTemplate().update(con -> {
-                PreparedStatement stmt = con.prepareStatement("INSERT INTO logins(user_id,hash) VALUES (?,?)");
-                stmt.setInt(1, uid);
-                stmt.setString(2, hash);
-                return stmt;
-            });
-            return hash;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int checkPassword(final String username, final String password) {
-        try {
-            String realPassword = getJdbcTemplate().queryForObject(
-                    "SELECT passw FROM users WHERE nick=?", String.class, username);
-            if (realPassword.equals(password)) {
-                User user = getUserByName(username);
-                if (user != null) {
-                    return user.getUid();
-                } else {
-                    return -1;
-                }
-            } else {
-                return -1;
-            }
-        } catch (EmptyResultDataAccessException e) {
-            return -1;
-        }
-    }
-
-    @Transactional
-    @Override
-    public boolean updatePassword(final User user, final String newPassword) {
-        return user.getUid() > 0 && getJdbcTemplate().update("UPDATE users SET passw=? WHERE id=?", newPassword, user.getUid()) > 0;
-    }
-
-    @Transactional
-    @Override
-    public String updateSecretEmail(final User user) {
-        String newHash = UserUtils.generateHash(16);
-        if (getJdbcTemplate().update(
-                "INSERT INTO mail(user_id,hash) VALUES (?,?) ON DUPLICATE KEY UPDATE hash=?",
-                user.getUid(),
-                newHash,
-                newHash) > 0) {
-            return newHash;
-        }
-        return "";
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int getUserOptionInt(final int uid, final String option, final int defaultValue) {
-        try {
-            return getJdbcTemplate().queryForObject("SELECT " + option + " FROM useroptions WHERE user_id=?", Integer.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return defaultValue;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public void setUserOptionInt(final int uid, final String option, final int value) {
-        getJdbcTemplate().update("UPDATE useroptions SET " + option + "=? WHERE user_id=?", value, uid);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public UserInfo getUserInfo(final User user) {
-        try {
-            return getJdbcTemplate().queryForObject("SELECT fullname,country,url,descr FROM usersinfo WHERE user_id=?",
-                    ((rs, rowNum) -> {
-                        UserInfo info = new UserInfo();
-                        info.setFullName(rs.getString(1));
-                        info.setCountry(rs.getString(2));
-                        info.setUrl(rs.getString(3));
-                        info.setDescription(rs.getString(4));
-                        return info;
-                    }), user.getUid());
-        } catch (EmptyResultDataAccessException e) {
-            return new UserInfo();
-        }
-    }
-
-    @Transactional
-    @Override
-    public boolean updateUserInfo(final User user, final UserInfo info) {
-        return getJdbcTemplate().update(
-                "INSERT INTO usersinfo(user_id,fullname,country,url,descr) VALUES (?,?,?,?,?) " +
-                        "ON DUPLICATE KEY UPDATE fullname=?,country=?,url=?,descr=?",
-                user.getUid(),
-                info.getFullName(),
-                info.getCountry(),
-                info.getUrl(),
-                info.getDescription(),
-                info.getFullName(),
-                info.getCountry(),
-                info.getUrl(),
-                info.getDescription()) > 0;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public boolean getCanMedia(final int uid) {
-        try {
-            int res = getJdbcTemplate().queryForObject(
-                    "SELECT users.lastphoto-UNIX_TIMESTAMP() FROM users WHERE id=?",
-                    Integer.class,
-                    uid);
-            return res < 3600;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public boolean isInWL(final int uid, final int check) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT 1 FROM wl_users WHERE user_id=? AND wl_user_id=?",
-                    Integer.class, uid, check) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public boolean isInBL(final int uid, final int check) {
-        try {
-            return getJdbcTemplate().queryForObject("SELECT 1 FROM bl_users WHERE user_id=? AND bl_user_id=?",
-                    Integer.class, uid, check) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public boolean isInBLAny(final int uid, final int uid2) {
-        try {
-            return getJdbcTemplate().queryForObject("SELECT 1 FROM bl_users "
-                    + "WHERE (user_id=? AND bl_user_id=?) "
-                    + "OR (user_id=? AND bl_user_id=?)", new Object[]{uid, uid2, uid2, uid}, Integer.class) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> checkBL(final int visitor, final List<Integer> uids) {
-        if (!uids.isEmpty()) {
-            return getJdbcTemplate().queryForList(
-                    "SELECT user_id FROM bl_users WHERE bl_user_id=? and user_id IN (" +
-                            StringUtils.collectionToCommaDelimitedString(uids) + ")",
-                    Integer.class,
-                    visitor);
-        } else {
-            return new ArrayList<>();
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public boolean isSubscribed(final int uid, final int check) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT 1 FROM subscr_users WHERE suser_id=? AND user_id=?",
-                    Integer.class, uid, check) == 1;
-        } catch (EmptyResultDataAccessException e) {
-            return false;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Integer> getUserRead(final int uid) {
-        return getJdbcTemplate().queryForList(
-                "SELECT user_id FROM subscr_users WHERE suser_id=?", Integer.class, uid);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<com.juick.User> getUserReadLeastPopular(final int uid, final int cnt) {
-        return getJdbcTemplate().query(
-                "SELECT users.id,users.nick FROM (subscr_users " +
-                        "INNER JOIN users_subscr ON (subscr_users.suser_id=? " +
-                        "AND subscr_users.user_id=users_subscr.user_id)) INNER JOIN users " +
-                        "ON subscr_users.user_id=users.id ORDER BY cnt LIMIT ?",
-                (rs, num) -> {
-                    com.juick.User u = new com.juick.User();
-                    u.setUid(rs.getInt(1));
-                    u.setName(rs.getString(2));
-                    return u;
-                },
-                uid,
-                cnt);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<User> getUserReaders(final int uid) {
-        return getJdbcTemplate().query(
-                "SELECT users.id, users.nick FROM subscr_users " +
-                        "INNER JOIN users ON subscr_users.suser_id=users.id " +
-                        "WHERE subscr_users.user_id=? ORDER BY users.nick",
-                (rs, num) -> {
-                    com.juick.User u = new com.juick.User();
-                    u.setUid(rs.getInt(1));
-                    u.setName(rs.getString(2));
-                    return u;
-                },
-                uid);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<User> getUserFriends(final int uid) {
-        return getJdbcTemplate().query(
-                "SELECT users.id,users.nick FROM subscr_users " +
-                        "INNER JOIN users ON subscr_users.user_id=users.id " +
-                        "WHERE subscr_users.suser_id=? AND users.id!=? " +
-                        "ORDER BY users.nick",
-                (rs, num) -> {
-                    com.juick.User u = new com.juick.User();
-                    u.setUid(rs.getInt(1));
-                    u.setName(rs.getString(2));
-                    return u;
-                },
-                uid,
-                uid);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<com.juick.User> getUserBLUsers(final int uid) {
-        return getJdbcTemplate().query("SELECT users.id,users.nick FROM users INNER JOIN bl_users " +
-                        "ON(bl_users.bl_user_id=users.id) WHERE bl_users.user_id=? ORDER BY users.nick",
-                (rs, num) -> {
-                    com.juick.User u = new com.juick.User();
-                    u.setUid(rs.getInt(1));
-                    u.setName(rs.getString(2));
-                    return u;
-                }, uid);
-    }
-
-    @Transactional
-    @Override
-    public boolean linkTwitterAccount(
-            final User user, final String accessToken, final String accessTokenSecret, final String screenName) {
-        if (getJdbcTemplate().update("INSERT INTO twitter(user_id,access_token,access_token_secret,uname) " +
-                        "VALUES (?,?,?,?)" +
-                        " ON DUPLICATE KEY UPDATE access_token=?,access_token_secret=?,uname=?",
-                user.getUid(), accessToken, accessTokenSecret, screenName, accessToken, accessTokenSecret, screenName) > 0) {
-            return getJdbcTemplate().update("INSERT INTO subscr_users(user_id,suser_id,jid) " +
-                    "VALUES (?,1741,'juick\\@twitter.juick.com')", user.getUid()) > 0;
-        }
-        return false;
-
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int getStatsIRead(final int uid) {
-        try {
-            return getJdbcTemplate().queryForObject("SELECT COUNT(*) FROM subscr_users WHERE suser_id=?", Integer.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int getStatsMyReaders(final int uid) {
-        try {
-            return getJdbcTemplate().queryForObject("SELECT COUNT(*) FROM subscr_users WHERE user_id=?", Integer.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int getStatsMessages(final int uid) {
-        try {
-            return getJdbcTemplate().queryForObject("SELECT COUNT(*) FROM messages WHERE user_id=?", Integer.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public int getStatsReplies(final int uid) {
-        try {
-            return getJdbcTemplate().queryForObject("SELECT COUNT(*) FROM replies WHERE user_id=?", Integer.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    @Transactional
-    @Override
-    public boolean setActiveStatusForJID(final String JID, final UserService.ActiveStatus jidStatus) {
-        User user = getUserByJID(JID);
-        if (user != null) {
-            return getJdbcTemplate().update(con -> {
-                PreparedStatement preparedStatement = con.prepareStatement(
-                        "UPDATE jids SET active=? WHERE user_id=? AND jid=?");
-                int newStatus = jidStatus == UserService.ActiveStatus.Active ? 1 : 0;
-                preparedStatement.setInt(1, newStatus);
-                preparedStatement.setInt(2, user.getUid());
-                preparedStatement.setString(3, JID);
-                return preparedStatement;
-
-            }) >= 0;
-        }
-        return false;
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<String> getAllJIDs(final User user) {
-        return getJdbcTemplate().queryForList(
-                "SELECT jid FROM jids WHERE user_id=?", String.class, user.getUid());
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<Auth> getAuthCodes(final User user) {
-        return getJdbcTemplate().query(
-                "SELECT account,authcode FROM auth WHERE user_id=? AND protocol='xmpp'",
-                (rs, num) -> new Auth(rs.getString(1), rs.getString(2)),
-                user.getUid());
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<String> getEmails(final User user) {
-        return getJdbcTemplate().queryForList("SELECT email FROM emails WHERE user_id=?", String.class, user.getUid());
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public EmailOpts getEmailOpts(final User user) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT email,subscr_hour FROM emails WHERE user_id=? AND subscr_hour IS NOT NULL",
-                    (rs, num) -> new EmailOpts(rs.getString(1), rs.getInt(2)), user.getUid());
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public String getEmailHash(final User user) {
-        try {
-            return getJdbcTemplate().queryForObject(
-                    "SELECT hash FROM mail WHERE user_id=?",
-                    String.class,
-                    user.getUid())
-                    + "@mail.juick.com";
-        } catch (EmptyResultDataAccessException e) {
-            return "";
-        }
-    }
-}
diff --git a/server-core/src/main/java/com/juick/util/TagUtils.java b/server-core/src/main/java/com/juick/util/TagUtils.java
deleted file mode 100644
index 157522ab..00000000
--- a/server-core/src/main/java/com/juick/util/TagUtils.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.juick.util;
-
-import com.juick.Tag;
-import org.apache.commons.collections4.CollectionUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public class TagUtils {
-    private TagUtils() {
-        throw new IllegalStateException();
-    }
-
-    public static String toString(final List<Tag> tags) {
-        if (CollectionUtils.isEmpty(tags))
-            return "";
-
-        return tags.stream().map(t -> " *" + t.getName())
-                .collect(Collectors.joining());
-    }
-}
diff --git a/server-core/src/main/java/com/juick/util/ThreadHelper.java b/server-core/src/main/java/com/juick/util/ThreadHelper.java
deleted file mode 100644
index 64a56f7c..00000000
--- a/server-core/src/main/java/com/juick/util/ThreadHelper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.juick.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Created by aalexeev on 11/11/16.
- */
-public class ThreadHelper {
-    private ThreadHelper() {
-        throw new IllegalStateException();
-    }
-
-    private static Logger logger = LoggerFactory.getLogger(ThreadHelper.class);
-
-    public static void shutdownAndAwaitTermination(ExecutorService pool) {
-        pool.shutdown(); // Disable new tasks from being submitted
-        try {
-            // Wait a while for existing tasks to terminate
-            if (!pool.awaitTermination(5, TimeUnit.SECONDS)) {
-                logger.info("Calls shutDownNow for pool");
-                pool.shutdownNow(); // Cancel currently executing tasks
-                // Wait a while for tasks to respond to being cancelled
-                if (!pool.awaitTermination(5, TimeUnit.SECONDS))
-                    logger.error("Pool did not terminate");
-            }
-        } catch (InterruptedException ie) {
-            // (Re-)Cancel if current thread also interrupted
-            pool.shutdownNow();
-            // Preserve interrupt status
-            Thread.currentThread().interrupt();
-        }
-    }
-}
diff --git a/server-core/src/main/java/com/juick/util/UserUtils.java b/server-core/src/main/java/com/juick/util/UserUtils.java
deleted file mode 100644
index 611a3b15..00000000
--- a/server-core/src/main/java/com/juick/util/UserUtils.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.juick.util;
-
-import java.util.Random;
-
-/**
- * Created by aalexeev on 11/14/16.
- */
-public class UserUtils {
-    private UserUtils() {
-        throw new IllegalStateException();
-    }
-
-    private static final String ABCDEF = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-    public static String generateHash(final int len) {
-        Random rnd = new Random();
-        StringBuilder sb = new StringBuilder(len);
-        for (int i = 0; i < len; i++) {
-            sb.append(ABCDEF.charAt(rnd.nextInt(ABCDEF.length())));
-        }
-        return sb.toString();
-    }
-
-    public static boolean checkUserNameValid(final String uname) {
-        return uname != null && uname.length() >= 2 && uname.length() <= 16 && uname.matches("[a-zA-Z0-9\\-]+");
-    }
-}