Revert "fig support WIP"

This reverts commit e62ae48824d7b2358488bb19d3f37c154bc88c77.