changes -remove extra code