Remove traces of old Polymorphic association