Cleaning some extra code