Removed further use of deprecated methods