Remove poipoitype

Also rename Data to PTData to make more sense