move to totally clean aospa