Oops, remove some remained stuffs