Remove all join dependency stuff