Got rid of old code