diff --git a/tasks/rabbitmq_cluster_join.yml b/tasks/rabbitmq_cluster_join.yml
index 907e553..316faea 100644
--- a/tasks/rabbitmq_cluster_join.yml
+++ b/tasks/rabbitmq_cluster_join.yml
@@ -13,6 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+- name: Remove all files in RabbitMQ mnesia directory
+  file:
+    path: "/var/lib/rabbitmq/mnesia/"
+    owner: "rabbitmq"
+    group: "rabbitmq"
+    mode: "0760"
+    state: "{{ item }}"
+  with_items:
+    - absent
+
+- include_tasks: rabbitmq_restart.yml
+
 - name: Stop rabbitmq app
   shell: |
     rabbitmqctl stop_app
diff --git a/tasks/rabbitmq_feature_flags.yml b/tasks/rabbitmq_feature_flags.yml
index 33b047a..82b77f0 100644
--- a/tasks/rabbitmq_feature_flags.yml
+++ b/tasks/rabbitmq_feature_flags.yml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 - name: "Gather cluster status"
-  command: "rabbitmqctl cluster_status --formatter json"
+  shell: "rabbitmqctl cluster_status --formatter json | tail -n 1"
   register: _cluster_status
   changed_when: False
   tags:
diff --git a/tasks/rabbitmq_upgrade_check.yml b/tasks/rabbitmq_upgrade_check.yml
index cb5ee56..287a92a 100644
--- a/tasks/rabbitmq_upgrade_check.yml
+++ b/tasks/rabbitmq_upgrade_check.yml
@@ -56,19 +56,6 @@
     - "{{ installed_rabbitmq_deb }}"
     - "{{ installed_rabbitmq_rpm }}"
 
-- name: Compare installed version of RabbitMQ with new version variable
-  fail:
-    msg: "To install a new major/minor version of RabbitMQ set '-e rabbitmq_upgrade=true'."
-  when:
-    - not rabbitmq_upgrade | bool
-    - installed_rabbitmq.rc == 0
-    - not installed_rabbitmq.stdout is search(rabbitmq_package_version)
-    - rabbitmq_install_method != 'distro'
-  tags:
-    - rabbitmq-package-deb
-    - rabbitmq-package-rpm
-    - rabbitmq-apt-packages
-
 - include_tasks: rabbitmq_upgrade_prep.yml
   args:
     apply: