rebuilt the linking tables

removed the PKs and misc stuff from the linking tables so that EF
wouldn't make them true entities and just use them as bridges for
relationships