Cleanup and simplify roles

This shouldn't cause any changes on the servers.