cleanup and project relabeling