Removing excess core dependencies