Removing needless dependencies