Removed todo since it's far out of date