Label cleanup