removing rubbish code