Sort out remaining ghost todos