cleanup, remove use of deprecated methods