Remove, now add in manifest like in aospa-legacy