Cleanup of default role configuration and implementation