Removing extra code