Added CORS and remove cpu/timer stuff