Get rid of unused stuff
prepare for KK