diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowsResources.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowsResources.java
deleted file mode 100644
index e0de6dd7c..000000000
--- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/api/mastodon/FollowsResources.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *         Twidere - Twitter client for Android
- *
- * Copyright 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.mariotaku.microblog.library.api.mastodon;
-
-import org.mariotaku.microblog.library.MicroBlogException;
-import org.mariotaku.microblog.library.model.mastodon.Account;
-import org.mariotaku.restfu.annotation.method.POST;
-import org.mariotaku.restfu.annotation.param.Param;
-
-/**
- * Created by mariotaku on 2017/4/17.
- */
-
-public interface FollowsResources {
-
-    /**
-     * Following a remote user
-     *
-     * @param uri {@code username@domain} of the person you want to follow
-     * @return The local representation of the followed account, as an {@link Account}.
-     */
-    @POST("/v1/follows")
-    Account followRemoteUser(@Param("uri") String uri) throws MicroBlogException;
-}
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/FriendshipPromises.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/FriendshipPromises.kt
index 775c4b561..dd7e8d622 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/promise/FriendshipPromises.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/promise/FriendshipPromises.kt
@@ -111,12 +111,6 @@ class FriendshipPromises private constructor(val application: Application) {
                     }
                     AccountType.MASTODON -> {
                         val mastodon = account.newMicroBlogInstance(application, Mastodon::class.java)
-                        if (account.key.host != userKey.host) {
-                            if (screenName == null)
-                                throw MicroBlogException("Screen name required to follow remote user")
-                            return@then mastodon.followRemoteUser("$screenName@${userKey.host}")
-                                    .toParcelable(account)
-                        }
                         mastodon.followUser(userKey.id)
                         return@then mastodon.getAccount(userKey.id).toParcelable(account)
                     }