Revert "add kick and changed some"

This reverts commit 05e0e38380ad8927c26354f49b88bbedd360806c.