Removed deprecated checks