spring cleaning- removing extra code