Remove DSP Manager and Add Apollo to Build