Fix removal of polymorphic associations