Clean up roles after refactor