remove deprecated code

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
removed unused key, small fix & improve test case

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>