Eliminate dependencies & fix ~1000 bugs