remove dependency from abort to token