minor improvements

removed ontimeout event handler