remove some major issue