Remove this DEBUG nonsense