removed some rubbish code