refactor deprecated methods