aospa-legacy rm'd more repos, follow suite