Took out unnecessary tables