Use the project sets to determine the data, cleanup
More edits to use the dynamic project set