Removed pointless headers