Comment out unused header items for demo