Removing references not present in upstream right now