Minor refactoring
Remove a useless setTimeout