removing dead code, other cleanup
removing dead code, other cleanup

yangf4/core,yangf4/core,YetAnotherMinion/core,YetAnotherMinion/core,yangf4/core,yangf4/core,yangf4/core,YetAnotherMinion/core,YetAnotherMinion/core,YetAnotherMinion/core