Removing static imports in favor of direct call