remove some deprecation marks for now