add some module and remove some unused module