Remove TODO, it's done!