Feat/client cleanup