Remove obsolete code

Signed-off-by: Chun Chen <chun.chen@archermind.com>