Esp cleanup