Remove from core functionality which relates to point registers