removed rubbish code