Remove Sentinel hard dependency in view