Fix a compile warning on constant

Signed-off-by: Junjie Mao <eternal.n08@gmail.com>
Remove legacy files derived from 'supervisor' age

Signed-off-by: Junjie Mao <eternal.n08@gmail.com>