Remove code not in use any more.
Add an abstract data point type.