Remove commented code and todos