Merge "Remove aaa features that do not exist anymore"