Deprecator refactor
Deprecator refactor