Remove some more remnants