Remove recovery and updater dependency