Move deprecate macro in kitchen sink