Clean up Project class