removing code that Erik Olson re-wrote