remove unneeded deprecated calls