Removing Sentinel hardcoded dependency