Some cleaning up of AR