Deprecate methods
Changes for code review feedback