WIP work for demo mode
Revert "LIB: Trim whitespace off classificatine engine type string"

This reverts commit 650274e45f63662da0026106289f9a248cbcaeb6.