Removed deprecated headers