Removed unneeded join tables