remove @deprecated from thing I tried to refactor away from; rebased branch excludes refactorings