generalize accord dep & remove some debug stuff