Lower timeouts to 1s, remove unused methods