removing unshared modules and squash filter class methods into the proper models