Cleaning up more dependencies