removed recovery handling and old revel helpers