These headers aren't needed anymore