remove extra code 2