Remove old directory

Change-Id: Ifcb86cbaf46322a69ea389f3b5650d842574f347
Support an Emergency backend in case primary goes down

Change-Id: I53e8ca78cc4c84a5edec8e4369ffef034bf95787