ENTESB-1709: stripping out some fabric modules