removing redundant role_users table and adding site_id for all relationship tables