Got rid of TODOS that we have already done