Started removing references to MotoActv