fix bug
Remove irrelevant code