remove some bad design