Getting rid of dodgy setTimeout, as it's not solving anything anyway.