Clean up classifier

Change-Id: Ie42b7389849defb0fc7c60868ea40adadac5b713
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>