XD-911 Reduce the number of critical errors

Remove Package Tangles.