Began removal of usage of deprecated methods