Remove debug + kick properly