some fixes and dropped the generic role mappings tables