Clear up some extension dependencies