Node cleanup
Client cleanup
Endpoints api cleanup