Remove the last remnants