Delete runs now. Plus some refactoring.