Removing new implementation and isolating refactoring to entitlement component