remove useless part and done for basic structure