Add mock and verbose options
cleanup client