cleanup, arriving at a much simpler solution
manage deps