Removing extra code,