move deprecation into separate branch