Removed solved todo