[entity,storage] remove hackish code from the bfss path [applied]