Reduce needless dependencies