Revert "add kick and changed some"

This reverts commit 4f34bcad9875a2f849159200599bc63e807f6939.