Removing Legacy FFDB code