Removing some of the deps not necesarry for stand-alone operation.