removed deprecated calls