Remove useless code and dont start immediately