Removed Date and Unit Handling

Also works with chatfield data