cleaned up some data dependency code