Clean up use of deprecated methods