Remove todo for now