Remove dead codes

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>