Removed deprecated references