cleanup, moved the low-level project label processing out of the high-level code to where it really belongs