Remove first with conditions deprecation warning