Removed used of deprecated methods