big rearrangement, kill dependencies