Remove a few unnecessary includes