aopt options cleanup