Cleanup and add/delete endpoint implementation

 - Not tested