Remove setTimeout call, not really needed