aosd paper - cleanup