Simplify

Remove request timeouts
Simplify locking and support a simpler approach to lock acquisition timeouts