Remove unneeded leftovers