Removed the long-term todo