Final cleanup, timeout tweaking