rm classes from cm that aren't in aospa