#1495: beat failover fixed (messy version)
#1495: Improvements for the failover code
#1495: Moving the failover changes to its own file
Removing not used packages