Removing some rubbish code