removed org_id from tables where not needed