Preapare for deprecation