remove some extra code