Getting rid of TODO that was fixed