Some cleanup of names an unused things.