Revert "extract api for client actions"

This reverts commit 7943eb39b7d04b34326ec6e8b98d20d5f07bad11.
format
extract client api calls (without formating)