Some more project cleanup