We shouldn't leave TODO's in the code