Remove a lingering todo
Fix a lingering bug from moving utils
New api calls, switch the the plural form too