started developing functionality for remove client