Change timers, removed the broken and useless code