Cleanup some unnecessary dependencies