refactoring `pomelo kill`

Change-Id: I294fd1145f968c4878ba60f13897745709eaa89c
Merge "refactoring `pomelo kill`"