got rid of the dependency baggage