Removed self dependency and added fe_exclude to body base