remove unneeded api call
add todo's to code