Deleted redundant and todos