removed account and account_id from tables because it is no longer used