Remove piece of the removed functionality