diff --git a/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt
index e1ea34e4acf8ac6f20b42ff02e34cb00300a1437..36f0c2c502df14892d2b12c2cfae3acc277e8619 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt
@@ -66,7 +66,6 @@ class LogInFragment : Fragment(R.layout.fragment_log_in), HasLoadingState {
 
     private fun setupViews() {
         with(binding) {
-            groupSignup.setIsVisible(CirclesAppConfig.isGplayFlavor())
             tvDomain.apply {
                 setAdapter(autocompleteAdapter)
                 onFocusChangeListener = OnFocusChangeListener { _, hasFocus ->
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt b/auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
index d723b78c2fc78a53f6cae26f9945c299b57ad5e4..a73ca0ea06f61ef338532b0b93813f3a928e9ca9 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
@@ -6,6 +6,7 @@ import org.futo.circles.auth.R
 import org.futo.circles.auth.feature.sign_up.SignUpDataSource
 import org.futo.circles.auth.feature.sign_up.SignUpDataSource.Companion.REGISTRATION_FREE_TYPE
 import org.futo.circles.auth.feature.sign_up.SignUpDataSource.Companion.REGISTRATION_SUBSCRIPTION_TYPE
+import org.futo.circles.core.base.CirclesAppConfig
 import org.futo.circles.core.extensions.createResult
 import org.futo.circles.core.provider.MatrixInstanceProvider
 import org.futo.circles.core.utils.HomeServerUtils.buildHomeServerConfigFromDomain
@@ -50,8 +51,10 @@ class SelectSignUpTypeDataSource @Inject constructor(
     fun getFreeSignupStages(flows: List<List<Stage>>): List<Stage>? =
         flows.firstOrNull { (it.firstOrNull() as? Stage.Other)?.type == REGISTRATION_FREE_TYPE }
 
-    // Must start with org.futo.subscription.google_play
+    // Must start with org.futo.subscription.google_play, available only for gPlay flavor
     fun getSubscriptionSignupStages(flows: List<List<Stage>>): List<Stage>? =
-        flows.firstOrNull { (it.firstOrNull() as? Stage.Other)?.type == REGISTRATION_SUBSCRIPTION_TYPE }
+        if (CirclesAppConfig.isGplayFlavor()) {
+            flows.firstOrNull { (it.firstOrNull() as? Stage.Other)?.type == REGISTRATION_SUBSCRIPTION_TYPE }
+        } else null
 
 }
\ No newline at end of file
diff --git a/auth/src/main/res/layout/fragment_log_in.xml b/auth/src/main/res/layout/fragment_log_in.xml
index 3f5ecbe3b1383735bd4f3d4c26ada8919f8279bb..643b1416a207ecae81966c8a6b19c38c953bf054 100644
--- a/auth/src/main/res/layout/fragment_log_in.xml
+++ b/auth/src/main/res/layout/fragment_log_in.xml
@@ -194,12 +194,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/groupSignup"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:constraint_referenced_ids="tvNotMember, btnSignUp" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/core/src/main/java/org/futo/circles/core/utils/MatrixUtils.kt b/core/src/main/java/org/futo/circles/core/utils/MatrixUtils.kt
index d6e393c12cd405487d6e56f8083f6276b308b0a6..fa57f8681f2b7c604bca3af4173d18ed955f8664 100644
--- a/core/src/main/java/org/futo/circles/core/utils/MatrixUtils.kt
+++ b/core/src/main/java/org/futo/circles/core/utils/MatrixUtils.kt
@@ -66,8 +66,6 @@ private fun getAllRoomsAndSpacesFilter(membershipFilter: List<Membership>) =
 fun getAllJoinedCirclesRoomsAndSpaces(session: Session = MatrixSessionProvider.getSessionOrThrow()) =
     session.roomService().getRoomSummaries(getAllRoomsAndSpacesFilter(listOf(Membership.JOIN)))
 
-fun getAllJoinedCirclesRoomsAndSpacesLiveData(session: Session = MatrixSessionProvider.getSessionOrThrow()) =
-    session.roomService().getRoomSummariesLive(getAllRoomsAndSpacesFilter(listOf(Membership.JOIN)))
 
 private fun getAllRoomsFiler(membershipFilter: List<Membership>) = roomSummaryQueryParams {
     excludeType = listOf(roomType, spaceType, null)