remove TODOs done in API