Cleanup LabelProvider: Removing dead code