removing fba/model caching for UX sake
cleaning up some