Remove old kick function

Remove old kick function && fix bugs