*8180* Migrate out of old role structure; clean up