Removed some rubbish code