Deletes some left-overs.
Update name references.