Remove old extra code