Clean up for the new Label stuff