Remove Apollo Media Player and code cleanup