Improve label cleanup