Removed the last todo markers