getting rid of Unity dependency in core projects