Remove workaround for rescue Timeout in cleanup thread