Remove abstract dependency from some methods