Remove Fay dependency in the hope of making memory usage better