[DELETE] Some cleanup before we start