Just removed the bits left from Charlotte's conflicts