Clean up join table & duplication