Remove some sneaky extras that shouldn't be there