Updated docstrings with pick_ori parameter
Remove trivial check