Even more cleanup of defaultroles