Should this just be removed entirely?