removed some tables we don't need to currently. Additioanlly ran the mig...

...ration and corrected the associations