Comment out more project compile blockers