Removed some unnecessary table creation