Relax some incorporations and remove dependencies on obsolete packages