Deprecator refactorings