always remove unused and renumber