correct set id
remove bundle test
optimize code