get rid of deprecated calls.