#49 minor changes
cleanup: removing obsolete data processing