clean up the rest API a bit more