more marking things for deprecation