Check and clean up endpoints access conditions

https://notes.teklia.com/CgCtEZGjT3e_xzWOFNjkVw?view

Includes #158 (closed) and #159 (closed)